From 135a5e579a6a7aba849fcfdc6997d5ce34f48d62 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 18 Oct 2013 21:10:33 +0000 Subject: [PATCH] Code maintenance for Qt 5: - Replaced Qt::WFlags with Qt::WindowFlags. - Removed path "QtCore/" and "QtGui/" from the includes. - Replaced "QString::toAscii()" with "QString::toLatin1()". git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/FeedReader/gui/FeedReaderConfig.cpp | 2 +- plugins/FeedReader/gui/FeedReaderConfig.h | 2 +- plugins/VOIP/gui/AudioInputConfig.cpp | 2 +- plugins/VOIP/gui/AudioInputConfig.h | 2 +- plugins/VOIP/gui/AudioStats.h | 4 ++-- retroshare-gui/src/gui/AboutDialog.cpp | 10 +++++----- retroshare-gui/src/gui/AboutDialog.h | 14 +++++++------- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 2 +- retroshare-gui/src/gui/ChatLobbyWidget.h | 2 +- .../src/gui/FileTransfer/DetailsDialog.cpp | 2 +- .../src/gui/FileTransfer/DetailsDialog.h | 2 +- .../gui/FileTransfer/FileTransferInfoWidget.cpp | 2 +- .../src/gui/FileTransfer/FileTransferInfoWidget.h | 2 +- retroshare-gui/src/gui/FriendsDialog.cpp | 2 +- retroshare-gui/src/gui/HelpDialog.cpp | 4 ++-- retroshare-gui/src/gui/LogoBar.cpp | 2 +- retroshare-gui/src/gui/LogoBar.h | 2 +- retroshare-gui/src/gui/MainWindow.cpp | 2 +- retroshare-gui/src/gui/MainWindow.h | 2 +- retroshare-gui/src/gui/MessengerWindow.cpp | 2 +- retroshare-gui/src/gui/MessengerWindow.h | 2 +- retroshare-gui/src/gui/QuickStartWizard.h | 4 ++-- retroshare-gui/src/gui/RetroShareLink.cpp | 8 ++++---- retroshare-gui/src/gui/bwgraph/bwgraph.cpp | 2 +- retroshare-gui/src/gui/bwgraph/bwgraph.h | 2 +- retroshare-gui/src/gui/chat/ChatDialog.cpp | 2 +- retroshare-gui/src/gui/chat/ChatDialog.h | 2 +- retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp | 2 +- retroshare-gui/src/gui/chat/ChatLobbyDialog.h | 2 +- retroshare-gui/src/gui/chat/ChatStyle.cpp | 4 ++-- retroshare-gui/src/gui/chat/ChatWidget.cpp | 2 +- retroshare-gui/src/gui/chat/PopupChatDialog.cpp | 2 +- retroshare-gui/src/gui/chat/PopupChatDialog.h | 2 +- retroshare-gui/src/gui/chat/PopupChatWindow.cpp | 2 +- retroshare-gui/src/gui/chat/PopupChatWindow.h | 2 +- .../src/gui/chat/PopupDistantChatDialog.cpp | 2 +- .../src/gui/chat/PopupDistantChatDialog.h | 2 +- retroshare-gui/src/gui/common/rwindow.cpp | 2 +- retroshare-gui/src/gui/common/rwindow.h | 2 +- retroshare-gui/src/gui/connect/ConfCertDialog.cpp | 2 +- retroshare-gui/src/gui/connect/ConfCertDialog.h | 2 +- .../src/gui/connect/ConnectProgressDialog.cpp | 2 +- .../src/gui/connect/ConnectProgressDialog.h | 2 +- retroshare-gui/src/gui/elastic/graphwidget.h | 2 +- retroshare-gui/src/gui/msgs/MessageComposer.cpp | 2 +- retroshare-gui/src/gui/msgs/MessageComposer.h | 2 +- retroshare-gui/src/gui/msgs/MessageWidget.cpp | 2 +- retroshare-gui/src/gui/msgs/MessageWidget.h | 2 +- retroshare-gui/src/gui/msgs/MessageWindow.cpp | 2 +- retroshare-gui/src/gui/msgs/MessageWindow.h | 2 +- retroshare-gui/src/gui/profile/ProfileWidget.cpp | 2 +- retroshare-gui/src/gui/profile/ProfileWidget.h | 2 +- retroshare-gui/src/gui/settings/AppearancePage.cpp | 2 +- retroshare-gui/src/gui/settings/AppearancePage.h | 2 +- retroshare-gui/src/gui/settings/ChatPage.cpp | 2 +- retroshare-gui/src/gui/settings/ChatPage.h | 2 +- retroshare-gui/src/gui/settings/CryptoPage.cpp | 2 +- retroshare-gui/src/gui/settings/CryptoPage.h | 2 +- .../src/gui/settings/DirectoriesPage.cpp | 2 +- retroshare-gui/src/gui/settings/DirectoriesPage.h | 2 +- .../src/gui/settings/FileAssociationsPage.cpp | 2 +- .../src/gui/settings/FileAssociationsPage.h | 2 +- retroshare-gui/src/gui/settings/ForumPage.cpp | 2 +- retroshare-gui/src/gui/settings/ForumPage.h | 2 +- retroshare-gui/src/gui/settings/GeneralPage.cpp | 2 +- retroshare-gui/src/gui/settings/GeneralPage.h | 2 +- retroshare-gui/src/gui/settings/MessagePage.cpp | 2 +- retroshare-gui/src/gui/settings/MessagePage.h | 2 +- retroshare-gui/src/gui/settings/NetworkPage.cpp | 2 +- retroshare-gui/src/gui/settings/NetworkPage.h | 2 +- retroshare-gui/src/gui/settings/NewTag.cpp | 2 +- retroshare-gui/src/gui/settings/NewTag.h | 2 +- retroshare-gui/src/gui/settings/NotifyPage.cpp | 2 +- retroshare-gui/src/gui/settings/NotifyPage.h | 2 +- retroshare-gui/src/gui/settings/PluginsPage.cpp | 2 +- retroshare-gui/src/gui/settings/PluginsPage.h | 2 +- retroshare-gui/src/gui/settings/RelayPage.cpp | 2 +- retroshare-gui/src/gui/settings/RelayPage.h | 4 ++-- retroshare-gui/src/gui/settings/ServerPage.cpp | 2 +- retroshare-gui/src/gui/settings/ServerPage.h | 2 +- retroshare-gui/src/gui/settings/SoundPage.cpp | 2 +- retroshare-gui/src/gui/settings/SoundPage.h | 2 +- retroshare-gui/src/gui/settings/TransferPage.cpp | 2 +- retroshare-gui/src/gui/settings/TransferPage.h | 4 ++-- retroshare-gui/src/gui/settings/rsettingswin.h | 2 +- .../src/gui/unfinished/ApplicationWindow.cpp | 2 +- .../src/gui/unfinished/ApplicationWindow.h | 2 +- .../src/gui/unfinished/blogs/BlogDetails.cpp | 2 +- .../src/gui/unfinished/blogs/BlogDetails.h | 2 +- .../src/gui/unfinished/blogs/CreateBlogMsg.cpp | 2 +- .../src/gui/unfinished/blogs/CreateBlogMsg.h | 2 +- retroshare-gui/src/retroshare-gui/configpage.h | 2 +- retroshare-gui/src/util/EventFilter.cpp | 2 +- retroshare-gui/src/util/EventFilter.h | 2 +- retroshare-gui/src/util/HandleRichText.cpp | 2 +- retroshare-gui/src/util/MouseEventFilter.cpp | 4 ++-- retroshare-gui/src/util/RetroStyleLabel.cpp | 2 +- retroshare-gui/src/util/RetroStyleLabel.h | 6 +++--- retroshare-gui/src/util/Widget.cpp | 2 +- retroshare-gui/src/util/WidgetBackgroundImage.cpp | 10 +++++----- retroshare-gui/src/util/stringutil.cpp | 2 +- 101 files changed, 127 insertions(+), 127 deletions(-) diff --git a/plugins/FeedReader/gui/FeedReaderConfig.cpp b/plugins/FeedReader/gui/FeedReaderConfig.cpp index 20d44ba7f..8ff5d1c58 100644 --- a/plugins/FeedReader/gui/FeedReaderConfig.cpp +++ b/plugins/FeedReader/gui/FeedReaderConfig.cpp @@ -25,7 +25,7 @@ #include "interface/rsFeedReader.h" /** Constructor */ -FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WFlags flags) +FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags) : ConfigPage(parent, flags), ui(new Ui::FeedReaderConfig) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/plugins/FeedReader/gui/FeedReaderConfig.h b/plugins/FeedReader/gui/FeedReaderConfig.h index 27a678d87..5d31b3b0c 100644 --- a/plugins/FeedReader/gui/FeedReaderConfig.h +++ b/plugins/FeedReader/gui/FeedReaderConfig.h @@ -37,7 +37,7 @@ class FeedReaderConfig : public ConfigPage public: /** Default Constructor */ - FeedReaderConfig(QWidget *parent = 0, Qt::WFlags flags = 0); + FeedReaderConfig(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ virtual ~FeedReaderConfig(); diff --git a/plugins/VOIP/gui/AudioInputConfig.cpp b/plugins/VOIP/gui/AudioInputConfig.cpp index ba97bafb3..23cd43bec 100644 --- a/plugins/VOIP/gui/AudioInputConfig.cpp +++ b/plugins/VOIP/gui/AudioInputConfig.cpp @@ -50,7 +50,7 @@ void AudioInputDialog::showEvent(QShowEvent *) { }*/ /** Constructor */ -AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WFlags flags) +AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/plugins/VOIP/gui/AudioInputConfig.h b/plugins/VOIP/gui/AudioInputConfig.h index ee118f509..6acbf1a1d 100644 --- a/plugins/VOIP/gui/AudioInputConfig.h +++ b/plugins/VOIP/gui/AudioInputConfig.h @@ -59,7 +59,7 @@ class AudioInputConfig : public ConfigPage public: /** Default Constructor */ - AudioInputConfig(QWidget * parent = 0, Qt::WFlags flags = 0); + AudioInputConfig(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~AudioInputConfig(); diff --git a/plugins/VOIP/gui/AudioStats.h b/plugins/VOIP/gui/AudioStats.h index dc4dc4166..f1a887fc2 100644 --- a/plugins/VOIP/gui/AudioStats.h +++ b/plugins/VOIP/gui/AudioStats.h @@ -31,8 +31,8 @@ #ifndef _AUDIOSTATS_H #define _AUDIOSTATS_H -#include -#include +#include +#include //#include "mumble_pch.hpp" diff --git a/retroshare-gui/src/gui/AboutDialog.cpp b/retroshare-gui/src/gui/AboutDialog.cpp index 6a417a26c..b3b6c98b1 100644 --- a/retroshare-gui/src/gui/AboutDialog.cpp +++ b/retroshare-gui/src/gui/AboutDialog.cpp @@ -27,11 +27,11 @@ #include #include "settings/rsharesettings.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include AboutDialog::AboutDialog(QWidget* parent) diff --git a/retroshare-gui/src/gui/AboutDialog.h b/retroshare-gui/src/gui/AboutDialog.h index 85e28905a..d179d5959 100644 --- a/retroshare-gui/src/gui/AboutDialog.h +++ b/retroshare-gui/src/gui/AboutDialog.h @@ -25,14 +25,14 @@ #include "ui_AboutDialog.h" -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class AWidget; diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 90b62250f..fb62df515 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -45,7 +45,7 @@ #define IMAGE_MESSAGE ":images/chat.png" #define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png" -ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags) +ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags) : RsAutoUpdatePage(5000, parent, flags) { setupUi(this); diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h index 98bfa1865..f595f05ef 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.h +++ b/retroshare-gui/src/gui/ChatLobbyWidget.h @@ -23,7 +23,7 @@ class ChatLobbyWidget : public RsAutoUpdatePage, Ui::ChatLobbyWidget public: /** Default constructor */ - ChatLobbyWidget(QWidget *parent = 0, Qt::WFlags flags = 0); + ChatLobbyWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ ~ChatLobbyWidget(); diff --git a/retroshare-gui/src/gui/FileTransfer/DetailsDialog.cpp b/retroshare-gui/src/gui/FileTransfer/DetailsDialog.cpp index ecd1f81e7..5cc2c108c 100644 --- a/retroshare-gui/src/gui/FileTransfer/DetailsDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/DetailsDialog.cpp @@ -31,7 +31,7 @@ #include "gui/RetroShareLink.h" /** Default constructor */ -DetailsDialog::DetailsDialog(QWidget *parent, Qt::WFlags flags) +DetailsDialog::DetailsDialog(QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/FileTransfer/DetailsDialog.h b/retroshare-gui/src/gui/FileTransfer/DetailsDialog.h index dae2d2d52..104758cc1 100644 --- a/retroshare-gui/src/gui/FileTransfer/DetailsDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/DetailsDialog.h @@ -33,7 +33,7 @@ class DetailsDialog : public QDialog public: /** Default constructor */ - DetailsDialog(QWidget *parent = 0, Qt::WFlags flags = 0); + DetailsDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ ~DetailsDialog() {} diff --git a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp index c03d49b7e..e29955ceb 100644 --- a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp +++ b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp @@ -40,7 +40,7 @@ static const int availability_map_size_X = 400 ;// length of availability bar static const int availability_map_size_Y = 20 ; // height of availability bar static const int tab_size = 200 ;// size between tabulated entries -FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WFlags /*f*/ ) +FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WindowFlags /*f*/ ) { QRect TaskGraphRect = geometry(); maxWidth = TaskGraphRect.width(); diff --git a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h index fc09b0fe9..53cc26e2a 100644 --- a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h +++ b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h @@ -34,7 +34,7 @@ class FileTransferInfoWidget : public RsAutoUpdatePage Q_OBJECT public: - FileTransferInfoWidget(QWidget * parent = 0, Qt::WFlags f = 0 ); + FileTransferInfoWidget(QWidget * parent = 0, Qt::WindowFlags f = 0 ); void setFileHash(const std::string& hash) { _file_hash = hash ; } diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 56b74f576..4d1de8646 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -394,7 +394,7 @@ void FriendsDialog::updateStatusString(const QString& peer_id, const QString& st std::cerr << "FriendsDialog: received group chat typing info. updating gui." << std::endl ; #endif - QString status = QString::fromUtf8(rsPeers->getPeerName(peer_id.toStdString()).c_str()) + " " + tr(status_string.toAscii()); + QString status = QString::fromUtf8(rsPeers->getPeerName(peer_id.toStdString()).c_str()) + " " + tr(status_string.toLatin1()); ui.statusStringLabel->setText(status) ; // displays info for 5 secs. QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ; diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp index e98e8fcfd..9ff6ca63f 100644 --- a/retroshare-gui/src/gui/HelpDialog.cpp +++ b/retroshare-gui/src/gui/HelpDialog.cpp @@ -26,8 +26,8 @@ #include -#include -#include +#include +#include /* Images for context menu icons */ #define IMAGE_DOWNLOAD ":/images/start.png" diff --git a/retroshare-gui/src/gui/LogoBar.cpp b/retroshare-gui/src/gui/LogoBar.cpp index 0ee7e96b0..c8a082220 100644 --- a/retroshare-gui/src/gui/LogoBar.cpp +++ b/retroshare-gui/src/gui/LogoBar.cpp @@ -25,7 +25,7 @@ #include -#include +#include LogoBar::LogoBar(QWidget * parent) : QFrame(parent) { diff --git a/retroshare-gui/src/gui/LogoBar.h b/retroshare-gui/src/gui/LogoBar.h index 0b5bfb6f9..068efdf86 100644 --- a/retroshare-gui/src/gui/LogoBar.h +++ b/retroshare-gui/src/gui/LogoBar.h @@ -22,7 +22,7 @@ #ifndef LOGOBAR_H #define LOGOBAR_H -#include +#include #include diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 99231bb9a..84a0ed501 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -176,7 +176,7 @@ } /** Constructor */ -MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) +MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags) : RWindow("MainWindow", parent, flags), ui(new Ui::MainWindow) { /* Invoke the Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 88eedc22a..f8ee9561a 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -166,7 +166,7 @@ public slots: protected: /** Default Constructor */ - MainWindow(QWidget *parent = 0, Qt::WFlags flags = 0); + MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); void closeEvent(QCloseEvent *); diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index 5ae45e9ba..58bf81887 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -92,7 +92,7 @@ void MessengerWindow::releaseInstance() } /** Constructor */ -MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags) +MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags) : RWindow("MessengerWindow", parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/MessengerWindow.h b/retroshare-gui/src/gui/MessengerWindow.h index a8e24552d..ff262be11 100644 --- a/retroshare-gui/src/gui/MessengerWindow.h +++ b/retroshare-gui/src/gui/MessengerWindow.h @@ -40,7 +40,7 @@ public slots: protected: /** Default Constructor */ - MessengerWindow(QWidget *parent = 0, Qt::WFlags flags = 0); + MessengerWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~MessengerWindow(); diff --git a/retroshare-gui/src/gui/QuickStartWizard.h b/retroshare-gui/src/gui/QuickStartWizard.h index 48a579e7d..fc88fd530 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.h +++ b/retroshare-gui/src/gui/QuickStartWizard.h @@ -22,8 +22,8 @@ #ifndef _QUICKSTARTWIZARD_H #define _QUICKSTARTWIZARD_H -#include -#include +#include +#include #include "ui_QuickStartWizard.h" diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index fc35c2fbc..35b92071b 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -959,7 +959,7 @@ bool RetroShareLink::checkSSLId(const QString& ssl_id) if(ssl_id.length() != 32) return false ; - QByteArray qb(ssl_id.toAscii()) ; + QByteArray qb(ssl_id.toLatin1()) ; for(int i=0;i chatDialogs; -ChatDialog::ChatDialog(QWidget *parent, Qt::WFlags flags) : +ChatDialog::ChatDialog(QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags) { setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/retroshare-gui/src/gui/chat/ChatDialog.h b/retroshare-gui/src/gui/chat/ChatDialog.h index eec0dae05..5f52e17b8 100644 --- a/retroshare-gui/src/gui/chat/ChatDialog.h +++ b/retroshare-gui/src/gui/chat/ChatDialog.h @@ -74,7 +74,7 @@ private slots: void chatNewMessage(ChatWidget*); protected: - explicit ChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0); + explicit ChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~ChatDialog(); void closeEvent(QCloseEvent *event); diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 4160b1045..74fc5d76c 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -46,7 +46,7 @@ #define COLUMN_COUNT 3 /** Default constructor */ -ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WFlags flags) +ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WindowFlags flags) : ChatDialog(parent, flags), lobbyId(lid) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h index 3ffa5e7e9..087b90466 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h @@ -60,7 +60,7 @@ signals: protected: /** Default constructor */ - ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent = 0, Qt::WFlags flags = 0); + ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ virtual ~ChatLobbyDialog(); diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp index 7a5b7c2d5..733d244ad 100644 --- a/retroshare-gui/src/gui/chat/ChatStyle.cpp +++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp @@ -310,12 +310,12 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co // Calculate color from the name // uint hash = 0x73ffe23a; // for (int i = 0; i < name.length(); ++i) { -// hash = (hash ^ 0x28594888) + ((uint32_t) name[i].toAscii() << (i % 4)); +// hash = (hash ^ 0x28594888) + ((uint32_t) name[i].toLatin1() << (i % 4)); // } uint hash = 0; for (int i = 0; i < name.length(); ++i) { - hash = (((hash << 1) + (hash >> 14)) ^ ((int) name[i].toAscii())) & 0x3fff; + hash = (((hash << 1) + (hash >> 14)) ^ ((int) name[i].toLatin1())) & 0x3fff; } color.setHsv(hash, 255, 150); diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index b55e7dfda..1d19ae093 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1027,7 +1027,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString) { - ui->statusLabel->setText(QString(statusMask).arg(tr(statusString.toAscii()))); // displays info for 5 secs. + ui->statusLabel->setText(QString(statusMask).arg(tr(statusString.toLatin1()))); // displays info for 5 secs. ui->typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") ); if (statusString == "is typing...") { diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 668f9c158..b2694efe5 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -38,7 +38,7 @@ #define WINDOW(This) dynamic_cast(This->window()) /** Default constructor */ -PopupChatDialog::PopupChatDialog(QWidget *parent, Qt::WFlags flags) +PopupChatDialog::PopupChatDialog(QWidget *parent, Qt::WindowFlags flags) : ChatDialog(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index a53aa24dd..cfc051876 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -42,7 +42,7 @@ private slots: protected: /** Default constructor */ - PopupChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0); + PopupChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ virtual ~PopupChatDialog(); diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp index 43ecedb25..7aaeea571 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp @@ -63,7 +63,7 @@ static PopupChatWindow *instance = NULL; } /** Default constructor */ -PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags) +PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.h b/retroshare-gui/src/gui/chat/PopupChatWindow.h index 40cfda860..d5708f270 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.h +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.h @@ -45,7 +45,7 @@ public: protected: /** Default constructor */ - PopupChatWindow(bool tabbed, QWidget *parent = 0, Qt::WFlags flags = 0); + PopupChatWindow(bool tabbed, QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ ~PopupChatWindow(); diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index 1e8fe5290..134a23398 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -39,7 +39,7 @@ PopupDistantChatDialog::~PopupDistantChatDialog() delete _update_timer ; } -PopupDistantChatDialog::PopupDistantChatDialog(QWidget *parent, Qt::WFlags flags) +PopupDistantChatDialog::PopupDistantChatDialog(QWidget *parent, Qt::WindowFlags flags) : PopupChatDialog(parent,flags) { _status_label = new QLabel ; diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h index 178f28050..82192a075 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h @@ -35,7 +35,7 @@ class PopupDistantChatDialog: public PopupChatDialog protected: /** Default constructor */ - PopupDistantChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0); + PopupDistantChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ virtual ~PopupDistantChatDialog(); diff --git a/retroshare-gui/src/gui/common/rwindow.cpp b/retroshare-gui/src/gui/common/rwindow.cpp index d723145ef..32cfba943 100644 --- a/retroshare-gui/src/gui/common/rwindow.cpp +++ b/retroshare-gui/src/gui/common/rwindow.cpp @@ -32,7 +32,7 @@ /** Default constructor. */ -RWindow::RWindow(QString name, QWidget *parent, Qt::WFlags flags) +RWindow::RWindow(QString name, QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) { _name = name; diff --git a/retroshare-gui/src/gui/common/rwindow.h b/retroshare-gui/src/gui/common/rwindow.h index 14d85c2ad..50582307e 100644 --- a/retroshare-gui/src/gui/common/rwindow.h +++ b/retroshare-gui/src/gui/common/rwindow.h @@ -37,7 +37,7 @@ class RWindow : public QMainWindow public: /** Default constructor. */ - RWindow(QString name, QWidget *parent = 0, Qt::WFlags flags = 0); + RWindow(QString name, QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Destructor. */ ~RWindow(); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 06126e27c..71f618a12 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -59,7 +59,7 @@ ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id) } /** Default constructor */ -ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlags flags) +ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags), mId(id) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.h b/retroshare-gui/src/gui/connect/ConfCertDialog.h index 5f4d2de21..06fac139a 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.h +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.h @@ -42,7 +42,7 @@ signals: private: /** Default constructor */ - ConfCertDialog(const std::string& id, QWidget *parent = 0, Qt::WFlags flags = 0); + ConfCertDialog(const std::string& id, QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ ~ConfCertDialog(); diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp index e24c7f50d..9cc2f2301 100755 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp @@ -54,7 +54,7 @@ ConnectProgressDialog *ConnectProgressDialog::instance(const std::string& peer_i return d; } -ConnectProgressDialog::ConnectProgressDialog(const std::string& id, QWidget *parent, Qt::WFlags flags) +ConnectProgressDialog::ConnectProgressDialog(const std::string& id, QWidget *parent, Qt::WindowFlags flags) :QDialog(parent, flags), mId(id), ui(new Ui::ConnectProgressDialog) { ui->setupUi(this); diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.h b/retroshare-gui/src/gui/connect/ConnectProgressDialog.h index dd0c5b21c..037ec6ca0 100644 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.h +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.h @@ -38,7 +38,7 @@ public: static void showProgress(const std::string& id); private: - ConnectProgressDialog(const std::string& id, QWidget *parent = 0, Qt::WFlags flags = 0); + ConnectProgressDialog(const std::string& id, QWidget *parent = 0, Qt::WindowFlags flags = 0); ~ConnectProgressDialog(); static ConnectProgressDialog *instance(const std::string& peer_id); diff --git a/retroshare-gui/src/gui/elastic/graphwidget.h b/retroshare-gui/src/gui/elastic/graphwidget.h index d7115f9e5..9fa9bb483 100644 --- a/retroshare-gui/src/gui/elastic/graphwidget.h +++ b/retroshare-gui/src/gui/elastic/graphwidget.h @@ -43,7 +43,7 @@ #define GRAPHWIDGET_H #include -#include +#include #include class Node; diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 7627328fa..507ee0020 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -111,7 +111,7 @@ public: }; /** Constructor */ -MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) +MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index 1372de7a3..d3a1ed70e 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -45,7 +45,7 @@ public: public: /** Default Constructor */ - MessageComposer(QWidget *parent = 0, Qt::WFlags flags = 0); + MessageComposer(QWidget *parent = 0, Qt::WindowFlags flags = 0); ~MessageComposer(); static void msgFriend(const std::string &id, bool group); diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index a9f4e2a01..f4cc63983 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -117,7 +117,7 @@ MessageWidget *MessageWidget::openMsg(const std::string &msgId, bool window) } /** Constructor */ -MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WFlags flags) +MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.h b/retroshare-gui/src/gui/msgs/MessageWidget.h index 24418acf1..51be360be 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.h +++ b/retroshare-gui/src/gui/msgs/MessageWidget.h @@ -45,7 +45,7 @@ public: }; public: - MessageWidget(bool controlled, QWidget *parent = 0, Qt::WFlags flags = 0); + MessageWidget(bool controlled, QWidget *parent = 0, Qt::WindowFlags flags = 0); ~MessageWidget(); static MessageWidget *openMsg(const std::string &msgId, bool window); diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.cpp b/retroshare-gui/src/gui/msgs/MessageWindow.cpp index d4e721790..739917a2a 100644 --- a/retroshare-gui/src/gui/msgs/MessageWindow.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWindow.cpp @@ -28,7 +28,7 @@ #include /** Constructor */ -MessageWindow::MessageWindow(QWidget *parent, Qt::WFlags flags) +MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags) : RWindow("MessageWindow", parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.h b/retroshare-gui/src/gui/msgs/MessageWindow.h index 40217f9f5..25ee06cc9 100644 --- a/retroshare-gui/src/gui/msgs/MessageWindow.h +++ b/retroshare-gui/src/gui/msgs/MessageWindow.h @@ -34,7 +34,7 @@ class MessageWindow : public RWindow public: /** Default Constructor */ - MessageWindow(QWidget *parent = 0, Qt::WFlags flags = 0); + MessageWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); ~MessageWindow(); void addWidget(MessageWidget *widget); diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp index ab6747747..dbc2ca6fb 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp +++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp @@ -35,7 +35,7 @@ #include /** Default constructor */ -ProfileWidget::ProfileWidget(QWidget *parent, Qt::WFlags flags) +ProfileWidget::ProfileWidget(QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.h b/retroshare-gui/src/gui/profile/ProfileWidget.h index 85756b1ef..c1aa3d6fb 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.h +++ b/retroshare-gui/src/gui/profile/ProfileWidget.h @@ -33,7 +33,7 @@ class ProfileWidget : public QWidget public: /** Default constructor */ - ProfileWidget(QWidget *parent = 0, Qt::WFlags flags = 0); + ProfileWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0); private slots: void showEvent ( QShowEvent * event ); diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index f8e42291b..812a9111c 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -29,7 +29,7 @@ #include "rsharesettings.h" /** Constructor */ -AppearancePage::AppearancePage(QWidget * parent, Qt::WFlags flags) +AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index 7d5d21c87..00a248199 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -31,7 +31,7 @@ class AppearancePage : public ConfigPage public: /** Default Constructor */ - AppearancePage(QWidget * parent = 0, Qt::WFlags flags = 0); + AppearancePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Saves the changes on this page */ virtual bool save(QString &errmsg); diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 80256c947..b14c24fca 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -94,7 +94,7 @@ static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWid } /** Constructor */ -ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags) +ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index 793aec362..b3ae5477e 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -31,7 +31,7 @@ class ChatPage : public ConfigPage public: /** Default Constructor */ - ChatPage(QWidget * parent = 0, Qt::WFlags flags = 0); + ChatPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~ChatPage() {} diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 576ae2427..ce79b7406 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -37,7 +37,7 @@ #include //for rsPeers variable /** Constructor */ -CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags) +CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index 248fd1ddb..cb3c013b4 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -31,7 +31,7 @@ class CryptoPage : public ConfigPage public: /** Default Constructor */ - CryptoPage(QWidget * parent = 0, Qt::WFlags flags = 0); + CryptoPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~CryptoPage(); diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp index 6ede1c229..71574523a 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp @@ -28,7 +28,7 @@ #include -DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WFlags flags) +DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.h b/retroshare-gui/src/gui/settings/DirectoriesPage.h index 05ab24398..4115015bb 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.h +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.h @@ -30,7 +30,7 @@ class DirectoriesPage: public ConfigPage Q_OBJECT public: - DirectoriesPage(QWidget * parent = 0, Qt::WFlags flags = 0); + DirectoriesPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Saves the changes on this page */ virtual bool save(QString &errmsg); diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp index 78a79463e..eca5fc215 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp @@ -53,7 +53,7 @@ //============================================================================ -FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WFlags flags) +FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) //:QFrame() { diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.h b/retroshare-gui/src/gui/settings/FileAssociationsPage.h index 168a0acb5..769dbabb0 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.h +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.h @@ -48,7 +48,7 @@ class FileAssociationsPage : public ConfigPage Q_OBJECT public: - FileAssociationsPage(QWidget * parent = 0, Qt::WFlags flags = 0); + FileAssociationsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); virtual ~FileAssociationsPage(); virtual void load(); diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp index bd325383c..573e05378 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.cpp +++ b/retroshare-gui/src/gui/settings/ForumPage.cpp @@ -26,7 +26,7 @@ #include "../MainWindow.h" #include "../ForumsDialog.h" -ForumPage::ForumPage(QWidget * parent, Qt::WFlags flags) +ForumPage::ForumPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/settings/ForumPage.h b/retroshare-gui/src/gui/settings/ForumPage.h index 0ae1d8c46..844393bfa 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.h +++ b/retroshare-gui/src/gui/settings/ForumPage.h @@ -30,7 +30,7 @@ class ForumPage : public ConfigPage Q_OBJECT public: - ForumPage(QWidget * parent = 0, Qt::WFlags flags = 0); + ForumPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~ForumPage(); /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index 7f463ab96..cbe3ecda0 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -32,7 +32,7 @@ #include /** Constructor */ -GeneralPage::GeneralPage(QWidget * parent, Qt::WFlags flags) +GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index ba7cf3728..0c191404b 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -32,7 +32,7 @@ class GeneralPage : public ConfigPage public: /** Default Constructor */ - GeneralPage(QWidget * parent = 0, Qt::WFlags flags = 0); + GeneralPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~GeneralPage(); diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index 2d634d605..3e42798fb 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -28,7 +28,7 @@ #include #include "NewTag.h" -MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags) +MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h index 477952d38..8c97818a3 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.h +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -34,7 +34,7 @@ class MessagePage : public ConfigPage Q_OBJECT public: - MessagePage(QWidget * parent = 0, Qt::WFlags flags = 0); + MessagePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~MessagePage(); /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/NetworkPage.cpp b/retroshare-gui/src/gui/settings/NetworkPage.cpp index f04242f04..4bc31e1b2 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.cpp +++ b/retroshare-gui/src/gui/settings/NetworkPage.cpp @@ -22,7 +22,7 @@ #include "NetworkPage.h" #include "rshare.h" -NetworkPage::NetworkPage(QWidget * parent, Qt::WFlags flags) +NetworkPage::NetworkPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/settings/NetworkPage.h b/retroshare-gui/src/gui/settings/NetworkPage.h index 36b08af29..781bdc3be 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.h +++ b/retroshare-gui/src/gui/settings/NetworkPage.h @@ -28,7 +28,7 @@ class NetworkPage : public ConfigPage { public: - NetworkPage(QWidget * parent = 0, Qt::WFlags flags = 0); + NetworkPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~NetworkPage() {} /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/NewTag.cpp b/retroshare-gui/src/gui/settings/NewTag.cpp index 6153245b4..4569a3718 100644 --- a/retroshare-gui/src/gui/settings/NewTag.cpp +++ b/retroshare-gui/src/gui/settings/NewTag.cpp @@ -25,7 +25,7 @@ #include /** Default constructor */ -NewTag::NewTag(MsgTagType &Tags, uint32_t nId /* = 0*/, QWidget *parent, Qt::WFlags flags) +NewTag::NewTag(MsgTagType &Tags, uint32_t nId /* = 0*/, QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags), m_Tags(Tags) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/settings/NewTag.h b/retroshare-gui/src/gui/settings/NewTag.h index 9092d3aad..41dca181e 100644 --- a/retroshare-gui/src/gui/settings/NewTag.h +++ b/retroshare-gui/src/gui/settings/NewTag.h @@ -36,7 +36,7 @@ class NewTag : public QDialog public: /** Default constructor */ - NewTag(MsgTagType &Tags, uint32_t nId = 0, QWidget *parent = 0, Qt::WFlags flags = 0); + NewTag(MsgTagType &Tags, uint32_t nId = 0, QWidget *parent = 0, Qt::WindowFlags flags = 0); uint32_t m_nId; diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 020ccf86d..6597da1b5 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -33,7 +33,7 @@ #include "gui/NewsFeed.h" /** Constructor */ -NotifyPage::NotifyPage(QWidget * parent, Qt::WFlags flags) +NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index 919d7c2a3..88603c591 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -58,7 +58,7 @@ class NotifyPage : public ConfigPage public: /** Default Constructor */ - NotifyPage(QWidget *parent = 0, Qt::WFlags flags = 0); + NotifyPage(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~NotifyPage(); diff --git a/retroshare-gui/src/gui/settings/PluginsPage.cpp b/retroshare-gui/src/gui/settings/PluginsPage.cpp index fbf0622b0..9b3c15ad7 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.cpp +++ b/retroshare-gui/src/gui/settings/PluginsPage.cpp @@ -32,7 +32,7 @@ #include "../MainWindow.h" -PluginsPage::PluginsPage(QWidget * parent, Qt::WFlags flags) +PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/settings/PluginsPage.h b/retroshare-gui/src/gui/settings/PluginsPage.h index f18e18647..9b9dd8349 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.h +++ b/retroshare-gui/src/gui/settings/PluginsPage.h @@ -29,7 +29,7 @@ class PluginsPage : public ConfigPage Q_OBJECT public: - PluginsPage(QWidget * parent = 0, Qt::WFlags flags = 0); + PluginsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~PluginsPage(); /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/RelayPage.cpp b/retroshare-gui/src/gui/settings/RelayPage.cpp index 3e3fbbc35..9bdeca918 100644 --- a/retroshare-gui/src/gui/settings/RelayPage.cpp +++ b/retroshare-gui/src/gui/settings/RelayPage.cpp @@ -32,7 +32,7 @@ #include -RelayPage::RelayPage(QWidget * parent, Qt::WFlags flags) +RelayPage::RelayPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/RelayPage.h b/retroshare-gui/src/gui/settings/RelayPage.h index 8174b75d6..82825175f 100644 --- a/retroshare-gui/src/gui/settings/RelayPage.h +++ b/retroshare-gui/src/gui/settings/RelayPage.h @@ -22,7 +22,7 @@ #ifndef RELAYPAGE_H #define RELAYPAGE_H -# include +# include #include #include "ui_RelayPage.h" @@ -32,7 +32,7 @@ class RelayPage: public ConfigPage Q_OBJECT public: - RelayPage(QWidget * parent = 0, Qt::WFlags flags = 0); + RelayPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~RelayPage() {} /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 73bb152c3..3f6bae27a 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -34,7 +34,7 @@ #include -ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags) +ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h index 84a3a1d63..332921759 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.h +++ b/retroshare-gui/src/gui/settings/ServerPage.h @@ -32,7 +32,7 @@ class ServerPage: public ConfigPage Q_OBJECT public: - ServerPage(QWidget * parent = 0, Qt::WFlags flags = 0); + ServerPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~ServerPage() {} /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index 53190b773..b53033416 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -36,7 +36,7 @@ #define TYPE_ITEM 1 /** Constructor */ -SoundPage::SoundPage(QWidget * parent, Qt::WFlags flags) +SoundPage::SoundPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/SoundPage.h b/retroshare-gui/src/gui/settings/SoundPage.h index dca157bc2..b506fa48c 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.h +++ b/retroshare-gui/src/gui/settings/SoundPage.h @@ -34,7 +34,7 @@ class SoundPage : public ConfigPage public: /** Default Constructor */ - SoundPage(QWidget * parent = 0, Qt::WFlags flags = 0); + SoundPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ ~SoundPage(); diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp index e5c9b709b..ce8c55a6c 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.cpp +++ b/retroshare-gui/src/gui/settings/TransferPage.cpp @@ -29,7 +29,7 @@ #include #include -TransferPage::TransferPage(QWidget * parent, Qt::WFlags flags) +TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h index a10538168..eeab8cbcf 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.h +++ b/retroshare-gui/src/gui/settings/TransferPage.h @@ -22,7 +22,7 @@ #ifndef TRANSFERPAGE_H # define TRANSFERPAGE_H -# include +# include #include #include "ui_TransferPage.h" @@ -32,7 +32,7 @@ class TransferPage: public ConfigPage Q_OBJECT public: - TransferPage(QWidget * parent = 0, Qt::WFlags flags = 0); + TransferPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~TransferPage() {} /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/rsettingswin.h b/retroshare-gui/src/gui/settings/rsettingswin.h index 8e9305b82..f977ff098 100755 --- a/retroshare-gui/src/gui/settings/rsettingswin.h +++ b/retroshare-gui/src/gui/settings/rsettingswin.h @@ -22,7 +22,7 @@ #ifndef RSETTINGSWIN_HPP_ #define RSETTINGSWIN_HPP_ -#include +#include #include #include "ui_settings.h" diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 6b638ed03..3b71ee84d 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -68,7 +68,7 @@ /** Constructor */ -ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) +ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) { /* Invoke the Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h index e60cceff2..a45138eb9 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h @@ -33,7 +33,7 @@ class ApplicationWindow : public QMainWindow public: /** Default Constructor */ - ApplicationWindow(QWidget *parent = 0, Qt::WFlags flags = 0); + ApplicationWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Destructor. */ ~ApplicationWindow(); diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp index e698596e2..6e88e647b 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp +++ b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp @@ -34,7 +34,7 @@ /** Default constructor */ -BlogDetails::BlogDetails(QWidget *parent, Qt::WFlags flags) +BlogDetails::BlogDetails(QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags) { /* Invoke Qt Designer generated QObject setup routine */ diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.h b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.h index f0e654d8c..d32fb50e1 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.h +++ b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.h @@ -33,7 +33,7 @@ class BlogDetails : public QDialog public: /** Default constructor */ - BlogDetails(QWidget *parent = 0, Qt::WFlags flags = 0); + BlogDetails(QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default destructor */ void showDetails(std::string mChannelId); diff --git a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp index 201c0c971..2231eadf1 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp +++ b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp @@ -40,7 +40,7 @@ #include /** Constructor */ -CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WFlags flags) +CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WindowFlags flags) : mBlogId(cId), QMainWindow (parent, flags) { /* Invoke the Qt Designer generated object setup routine */ diff --git a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h index 91a3c9610..9aa582350 100644 --- a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h +++ b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h @@ -43,7 +43,7 @@ class CreateBlogMsg : public QMainWindow public: /** Default Constructor */ - CreateBlogMsg(std::string cId, QWidget *parent = 0, Qt::WFlags flags = 0); + CreateBlogMsg(std::string cId, QWidget *parent = 0, Qt::WindowFlags flags = 0); /** Default Destructor */ void addAttachment(std::string path); diff --git a/retroshare-gui/src/retroshare-gui/configpage.h b/retroshare-gui/src/retroshare-gui/configpage.h index 2b9f1199d..1299f2b3f 100644 --- a/retroshare-gui/src/retroshare-gui/configpage.h +++ b/retroshare-gui/src/retroshare-gui/configpage.h @@ -29,7 +29,7 @@ class ConfigPage : public QWidget { public: /** Default Constructor */ - ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : QWidget(parent, flags), loaded(false) {} + ConfigPage(QWidget *parent = 0, Qt::WindowFlags flags = 0) : QWidget(parent, flags), loaded(false) {} /** Pure virtual method. Subclassed pages load their config settings here. */ virtual void load() = 0; diff --git a/retroshare-gui/src/util/EventFilter.cpp b/retroshare-gui/src/util/EventFilter.cpp index a1072cede..d55602d7c 100644 --- a/retroshare-gui/src/util/EventFilter.cpp +++ b/retroshare-gui/src/util/EventFilter.cpp @@ -21,7 +21,7 @@ #include -#include +#include EventFilter::EventFilter(QObject * receiver, const char * member) : QObject() { diff --git a/retroshare-gui/src/util/EventFilter.h b/retroshare-gui/src/util/EventFilter.h index 1ee7d8a19..b7cb8d0dc 100644 --- a/retroshare-gui/src/util/EventFilter.h +++ b/retroshare-gui/src/util/EventFilter.h @@ -26,7 +26,7 @@ #include -#include +#include class QEvent; diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp index c2066d81a..6d6ac9c98 100644 --- a/retroshare-gui/src/util/HandleRichText.cpp +++ b/retroshare-gui/src/util/HandleRichText.cpp @@ -740,7 +740,7 @@ bool RsHtml::makeEmbeddedImage(const QString &fileName, QString &embeddedImage, QImage image; if (image.load (fileName) == false) { - fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load", fileName.toAscii().constData()); + fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load", fileName.toLatin1().constData()); return false; } return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels); diff --git a/retroshare-gui/src/util/MouseEventFilter.cpp b/retroshare-gui/src/util/MouseEventFilter.cpp index 503e396e9..2220dbefa 100644 --- a/retroshare-gui/src/util/MouseEventFilter.cpp +++ b/retroshare-gui/src/util/MouseEventFilter.cpp @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/retroshare-gui/src/util/RetroStyleLabel.cpp b/retroshare-gui/src/util/RetroStyleLabel.cpp index 1a6d42d5e..aa3f3be4e 100644 --- a/retroshare-gui/src/util/RetroStyleLabel.cpp +++ b/retroshare-gui/src/util/RetroStyleLabel.cpp @@ -21,7 +21,7 @@ #include -#include +#include RetroStyleLabel::RetroStyleLabel(QWidget * parent, Mode mode, Qt::AlignmentFlag hAlign) : QLabel(parent), _mode(mode) { diff --git a/retroshare-gui/src/util/RetroStyleLabel.h b/retroshare-gui/src/util/RetroStyleLabel.h index 76282d3bf..150124632 100644 --- a/retroshare-gui/src/util/RetroStyleLabel.h +++ b/retroshare-gui/src/util/RetroStyleLabel.h @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include +#include +#include class RSQTUTIL_API RetroStyleLabel : public QLabel { diff --git a/retroshare-gui/src/util/Widget.cpp b/retroshare-gui/src/util/Widget.cpp index dcf2aa340..7a4eb42fe 100644 --- a/retroshare-gui/src/util/Widget.cpp +++ b/retroshare-gui/src/util/Widget.cpp @@ -21,7 +21,7 @@ #include -#include +#include QGridLayout * Widget::createLayout(QWidget * parent) { QGridLayout * layout = new QGridLayout(parent); diff --git a/retroshare-gui/src/util/WidgetBackgroundImage.cpp b/retroshare-gui/src/util/WidgetBackgroundImage.cpp index e77574752..2295987f6 100644 --- a/retroshare-gui/src/util/WidgetBackgroundImage.cpp +++ b/retroshare-gui/src/util/WidgetBackgroundImage.cpp @@ -21,11 +21,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void WidgetBackgroundImage::setBackgroundImage(QWidget * widget, const char * imageFile, WidgetBackgroundImage::AdjustMode adjustMode) { widget->setAutoFillBackground(true); diff --git a/retroshare-gui/src/util/stringutil.cpp b/retroshare-gui/src/util/stringutil.cpp index fe0d9d428..fc2339e02 100644 --- a/retroshare-gui/src/util/stringutil.cpp +++ b/retroshare-gui/src/util/stringutil.cpp @@ -310,7 +310,7 @@ bool string_is_hex(const QString &str) { for (int i = 0; i < str.length(); i++) { - char c = str[i].toUpper().toAscii(); + char c = str[i].toUpper().toLatin1(); if ((c < 'A' || c > 'F') && (c < '0' || c > '9')) return false; }