diff --git a/TODO.txt b/TODO.txt index 45782bba0..de5d51c19 100644 --- a/TODO.txt +++ b/TODO.txt @@ -283,6 +283,7 @@ H [ ] get rid of the old cache system (remove CacheStrapper, CacheSource, H [ ] enable circles for channels/posted/forums E [ ] enable people dialog E [ ] fix RSButtonOnText::eventFilter, and fix all places where RSButtonOnText gets deleted +E [ ] find all places where the deprecated(in Qt5) Q_WS_WIN and other Q_WS* macros are used, and replace with something else GXS H [ ] add the ability to use anonymous identities into circles. Needs new distribution model using items encrypted for multiple GXS keys. diff --git a/plugins/LinksCloud/AddLinksDialog.cpp b/plugins/LinksCloud/AddLinksDialog.cpp index 655f13c2a..366e2ccff 100644 --- a/plugins/LinksCloud/AddLinksDialog.cpp +++ b/plugins/LinksCloud/AddLinksDialog.cpp @@ -61,11 +61,6 @@ AddLinksDialog::AddLinksDialog(QString url, QWidget *parent) ui.titleLineEdit->setText(tr("New Link")); load(); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } int AddLinksDialog::IndexToScore(int index) diff --git a/plugins/LinksCloud/LinksDialog.cpp b/plugins/LinksCloud/LinksDialog.cpp index 8cce40f76..08ee39609 100644 --- a/plugins/LinksCloud/LinksDialog.cpp +++ b/plugins/LinksCloud/LinksDialog.cpp @@ -102,12 +102,6 @@ LinksDialog::LinksDialog(RsPeers *peers, RsFiles *files, QWidget *parent) QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->start(1000); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - } void LinksDialog::checkUpdate() diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index 5f686af6e..f9840d863 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -348,11 +348,6 @@ TransfersDialog::TransfersDialog(QWidget *parent) // ui.tunnelInfoWidget->setFrameStyle(QFrame::NoFrame); // ui.tunnelInfoWidget->setFocusPolicy(Qt::NoFocus); - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - /** Setup the actions for the context menu */ toggleShowCacheTransfersAct = new QAction(tr( "Show file list transfers" ), this ); toggleShowCacheTransfersAct->setCheckable(true) ; diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 2c115b6e2..2094e53f7 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -173,11 +173,6 @@ QList sizes; ") ; registerHelpButton(ui.helpButton, hlp_str) ; - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } FriendsDialog::~FriendsDialog () diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp index cecd56c24..2f6f9c86c 100644 --- a/retroshare-gui/src/gui/GetStartedDialog.cpp +++ b/retroshare-gui/src/gui/GetStartedDialog.cpp @@ -67,11 +67,6 @@ GetStartedDialog::GetStartedDialog(QWidget *parent) connect(ui.pushButton_Website, SIGNAL(clicked( bool )), this, SLOT(OpenWebsite())); connect(ui.pushButton_EmailFeedback, SIGNAL(clicked( bool )), this, SLOT(emailFeedback())); connect(ui.pushButton_EmailSupport, SIGNAL(clicked( bool )), this, SLOT(emailSupport())); - -/* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } GetStartedDialog::~GetStartedDialog() diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp index 9ff6ca63f..dfd1aaf63 100644 --- a/retroshare-gui/src/gui/HelpDialog.cpp +++ b/retroshare-gui/src/gui/HelpDialog.cpp @@ -77,12 +77,6 @@ HelpDialog::HelpDialog(QWidget *parent) } ui.label_2->setMinimumWidth(20); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index f6f2fbf0b..e7a2dc035 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -290,11 +290,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) // remove close button of the the first tab ui.tabWidget->hideCloseButton(0); - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - QString help_str = tr( "

  Messages

\

Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.

\ diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index 2cdc7e3f5..636d9ea98 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -173,10 +173,6 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags) } loadmystatusmessage(); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN -#endif } MessengerWindow::~MessengerWindow () diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index cbef4c751..fc07d6fd3 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -334,11 +334,6 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags) #if QT_VERSION < 0x040700 // embedded images are not supported before QT 4.7.0 ui.imagebtn->setVisible(false); -#endif - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - #endif } diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index 365588458..ffe50434b 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -173,11 +173,6 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f } ui.dateText-> setText(""); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } MessageWidget::~MessageWidget() diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.cpp b/retroshare-gui/src/gui/msgs/MessageWindow.cpp index b45235d05..9ad274b1e 100644 --- a/retroshare-gui/src/gui/msgs/MessageWindow.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWindow.cpp @@ -78,11 +78,6 @@ MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags) ui.viewtoolButton->setMenu(viewmenu); processSettings(true); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } MessageWindow::~MessageWindow() diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 1d58a5bbb..5f3e1143c 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -63,10 +63,6 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags) foreach (QString name, styleSheets.keys()) { ui.cmboStyleSheet->addItem(name, styleSheets[name]); } - - /* Hide platform specific features */ -#ifdef Q_WS_WIN -#endif } /** Saves the changes on this page */ diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 5061364c1..16a9f3fbc 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -103,12 +103,6 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) #if QT_VERSION < 0x040600 ui.minimumContrastLabel->hide(); ui.minimumContrast->hide(); -#endif - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - #endif } @@ -131,7 +125,7 @@ ChatPage::save(QString &/*errmsg*/) Settings->setChatSendMessageWithCtrlReturn(ui.sendMessageWithCtrlReturn->isChecked()); - Settings->setChatSearchShowBarByDefault(ui.cbSearch_ShowBar->isChecked()); + Settings->setChatSearchShowBarByDefault(ui.cbSearch_ShowBar->isChecked()); Settings->setChatSearchCharToStartSearch(ui.sbSearch_CharToStart->value()); Settings->setChatSearchCaseSensitively(ui.cbSearch_CaseSensitively->isChecked()); Settings->setChatSearchWholeWords(ui.cbSearch_WholeWords->isChecked()); @@ -234,7 +228,7 @@ ChatPage::load() ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn()); - ui.cbSearch_ShowBar->setChecked(Settings->getChatSearchShowBarByDefault()); + ui.cbSearch_ShowBar->setChecked(Settings->getChatSearchShowBarByDefault()); ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch()); ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively()); ui.cbSearch_WholeWords->setChecked(Settings->getChatSearchWholeWords()); diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 3fbc9835e..8cca2756c 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -53,10 +53,6 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) // hide profile manager as it causes bugs when generating a new profile. //ui.profile_Button->hide() ; - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime())); diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp index 71574523a..1bb387a26 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp @@ -40,11 +40,6 @@ DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.rememberHashesCB, SIGNAL(clicked(bool)), this, SLOT(clickedRememberHashes(bool))); connect(ui.rememberHashesCB, SIGNAL(clicked(bool)), this, SLOT(toggleRememberHashes())); connect(ui.autoCheckDirectories_CB, SIGNAL(clicked(bool)), this, SLOT(toggleAutoCheckDirectories(bool))); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } void DirectoriesPage::clearHashCache() diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index d0bc1f87e..404f25db4 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -137,11 +137,6 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) //To get ChatLobbyUserNotify Settings if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast(*it); } - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } NotifyPage::~NotifyPage() diff --git a/retroshare-gui/src/gui/settings/RelayPage.cpp b/retroshare-gui/src/gui/settings/RelayPage.cpp index 33adbe73f..a8458fb48 100644 --- a/retroshare-gui/src/gui/settings/RelayPage.cpp +++ b/retroshare-gui/src/gui/settings/RelayPage.cpp @@ -51,12 +51,6 @@ RelayPage::RelayPage(QWidget * parent, Qt::WindowFlags flags) QObject::connect(ui.enableCheckBox,SIGNAL(stateChanged(int)),this,SLOT(updateEnabled())); QObject::connect(ui.serverCheckBox,SIGNAL(stateChanged(int)),this,SLOT(updateEnabled())); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } QString RelayPage::helpText() const diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 104d8f5ce..10ea95c40 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -107,11 +107,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ui.torpage_incoming->setVisible(false); - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - #ifdef SERVER_DEBUG std::cerr << "ServerPage::ServerPage() called"; std::cerr << std::endl; diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp index 089363a9d..8c5421cbe 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp @@ -38,11 +38,6 @@ ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags ui.setupUi(this); //QObject::connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem *)), this, SLOT(tableItemChanged(QTableWidgetItem *))); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } QString ServicePermissionsPage::helpText() const diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index 082eb026b..ef93c7679 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -60,10 +60,6 @@ SoundPage::SoundPage(QWidget * parent, Qt::WindowFlags flags) #endif ui.eventTreeWidget->setTextElideMode(Qt::ElideMiddle); - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } SoundPage::~SoundPage() diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp index b90e3fb4a..273f5be5b 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.cpp +++ b/retroshare-gui/src/gui/settings/TransferPage.cpp @@ -54,11 +54,6 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags) QObject::connect(ui._max_tr_up_per_sec_SB, SIGNAL( valueChanged( int ) ), this, SLOT( updateMaxTRUpRate(int) ) ); ui._max_tr_up_per_sec_SB->setValue(rsTurtle->getMaxTRForwardRate()) ; - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } void TransferPage::updateMaxTRUpRate(int b) { diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp index 1b410171c..784db4957 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp @@ -85,12 +85,6 @@ ExampleDialog::ExampleDialog(QWidget *parent) _header->resizeSection ( 8, 100 ); _header->resizeSection ( 9, 100 ); _header->resizeSection ( 10, 100 ); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point ) diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp index 7e770e431..7673d5c7e 100644 --- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp @@ -105,12 +105,6 @@ GamesDialog::GamesDialog(QWidget *parent) // _header->resizeSection ( 8, 100 ); // _header->resizeSection ( 9, 100 ); // _header->resizeSection ( 10, 100 ); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp index 174725ec7..409073aba 100644 --- a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp @@ -77,11 +77,6 @@ LibraryDialog::LibraryDialog(QWidget *parent) /*QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->start(1000);*/ - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index b59c418fb..65c644a5d 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -112,12 +112,6 @@ PhotoDialog::PhotoDialog(QWidget *parent) QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->start(1000); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - } void PhotoDialog::checkUpdate() diff --git a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp index 08b668c9b..0edc7b36a 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp @@ -53,13 +53,6 @@ PhotoShow::PhotoShow(QWidget *parent) //connect( ui.photoTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem * , QTreeWidgetItem * ) ), this, SLOT( displayPhoto( ) ) ); //connect( ui.addButton, SIGNAL( clicked( ) ), this, SLOT( addPhotos( ) ) ); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif - } void PhotoShow::photoCustomPopupMenu( QPoint point ) diff --git a/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.cpp b/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.cpp index ccfcaec20..70ea9d2e6 100644 --- a/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.cpp +++ b/retroshare-gui/src/gui/unfinished/profile/ProfileEdit.cpp @@ -40,11 +40,6 @@ ProfileEdit::ProfileEdit(QWidget *parent) connect(ui.moveDownButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveDown())); connect(ui.moveUpButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveUp())); connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(close())); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } void ProfileEdit::profileCustomPopupMenu( QPoint /*point*/ ) diff --git a/retroshare-gui/src/gui/unfinished/profile/ProfileView.cpp b/retroshare-gui/src/gui/unfinished/profile/ProfileView.cpp index e69c2386b..1573e939d 100644 --- a/retroshare-gui/src/gui/unfinished/profile/ProfileView.cpp +++ b/retroshare-gui/src/gui/unfinished/profile/ProfileView.cpp @@ -49,11 +49,6 @@ ProfileView::ProfileView(QWidget *parent) connect(ui.profileditButton, SIGNAL(clicked()), this, SLOT(profileEdit())); loadAvatar(); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif } /** context popup menus */