removed empty #ifdef Q_WS_WIN

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-08 08:50:09 +00:00
parent 17a76071b6
commit e1fbd77d80
29 changed files with 3 additions and 147 deletions

View File

@ -283,6 +283,7 @@ H [ ] get rid of the old cache system (remove CacheStrapper, CacheSource,
H [ ] enable circles for channels/posted/forums H [ ] enable circles for channels/posted/forums
E [ ] enable people dialog E [ ] enable people dialog
E [ ] fix RSButtonOnText::eventFilter, and fix all places where RSButtonOnText gets deleted 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 GXS
H [ ] add the ability to use anonymous identities into circles. Needs new distribution model using items encrypted for multiple GXS keys. H [ ] add the ability to use anonymous identities into circles. Needs new distribution model using items encrypted for multiple GXS keys.

View File

@ -61,11 +61,6 @@ AddLinksDialog::AddLinksDialog(QString url, QWidget *parent)
ui.titleLineEdit->setText(tr("New Link")); ui.titleLineEdit->setText(tr("New Link"));
load(); load();
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
int AddLinksDialog::IndexToScore(int index) int AddLinksDialog::IndexToScore(int index)

View File

@ -102,12 +102,6 @@ LinksDialog::LinksDialog(RsPeers *peers, RsFiles *files, QWidget *parent)
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000); timer->start(1000);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void LinksDialog::checkUpdate() void LinksDialog::checkUpdate()

View File

@ -348,11 +348,6 @@ TransfersDialog::TransfersDialog(QWidget *parent)
// ui.tunnelInfoWidget->setFrameStyle(QFrame::NoFrame); // ui.tunnelInfoWidget->setFrameStyle(QFrame::NoFrame);
// ui.tunnelInfoWidget->setFocusPolicy(Qt::NoFocus); // ui.tunnelInfoWidget->setFocusPolicy(Qt::NoFocus);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
/** Setup the actions for the context menu */ /** Setup the actions for the context menu */
toggleShowCacheTransfersAct = new QAction(tr( "Show file list transfers" ), this ); toggleShowCacheTransfersAct = new QAction(tr( "Show file list transfers" ), this );
toggleShowCacheTransfersAct->setCheckable(true) ; toggleShowCacheTransfersAct->setCheckable(true) ;

View File

@ -173,11 +173,6 @@ QList<int> sizes;
") ; ") ;
registerHelpButton(ui.helpButton, hlp_str) ; registerHelpButton(ui.helpButton, hlp_str) ;
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
FriendsDialog::~FriendsDialog () FriendsDialog::~FriendsDialog ()

View File

@ -67,11 +67,6 @@ GetStartedDialog::GetStartedDialog(QWidget *parent)
connect(ui.pushButton_Website, SIGNAL(clicked( bool )), this, SLOT(OpenWebsite())); connect(ui.pushButton_Website, SIGNAL(clicked( bool )), this, SLOT(OpenWebsite()));
connect(ui.pushButton_EmailFeedback, SIGNAL(clicked( bool )), this, SLOT(emailFeedback())); connect(ui.pushButton_EmailFeedback, SIGNAL(clicked( bool )), this, SLOT(emailFeedback()));
connect(ui.pushButton_EmailSupport, SIGNAL(clicked( bool )), this, SLOT(emailSupport())); connect(ui.pushButton_EmailSupport, SIGNAL(clicked( bool )), this, SLOT(emailSupport()));
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
GetStartedDialog::~GetStartedDialog() GetStartedDialog::~GetStartedDialog()

View File

@ -77,12 +77,6 @@ HelpDialog::HelpDialog(QWidget *parent)
} }
ui.label_2->setMinimumWidth(20); ui.label_2->setMinimumWidth(20);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }

View File

@ -290,11 +290,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
// remove close button of the the first tab // remove close button of the the first tab
ui.tabWidget->hideCloseButton(0); ui.tabWidget->hideCloseButton(0);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
QString help_str = tr( QString help_str = tr(
" <h1><img width=\"32\" src=\":/images/64px_help.png\">&nbsp;&nbsp;Messages</h1> \ " <h1><img width=\"32\" src=\":/images/64px_help.png\">&nbsp;&nbsp;Messages</h1> \
<p>Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.</p> \ <p>Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.</p> \

View File

@ -173,10 +173,6 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags)
} }
loadmystatusmessage(); loadmystatusmessage();
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
MessengerWindow::~MessengerWindow () MessengerWindow::~MessengerWindow ()

View File

@ -334,11 +334,6 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
#if QT_VERSION < 0x040700 #if QT_VERSION < 0x040700
// embedded images are not supported before QT 4.7.0 // embedded images are not supported before QT 4.7.0
ui.imagebtn->setVisible(false); ui.imagebtn->setVisible(false);
#endif
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif #endif
} }

View File

@ -173,11 +173,6 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
} }
ui.dateText-> setText(""); ui.dateText-> setText("");
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
MessageWidget::~MessageWidget() MessageWidget::~MessageWidget()

View File

@ -78,11 +78,6 @@ MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags)
ui.viewtoolButton->setMenu(viewmenu); ui.viewtoolButton->setMenu(viewmenu);
processSettings(true); processSettings(true);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
MessageWindow::~MessageWindow() MessageWindow::~MessageWindow()

View File

@ -63,10 +63,6 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
foreach (QString name, styleSheets.keys()) { foreach (QString name, styleSheets.keys()) {
ui.cmboStyleSheet->addItem(name, styleSheets[name]); ui.cmboStyleSheet->addItem(name, styleSheets[name]);
} }
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
/** Saves the changes on this page */ /** Saves the changes on this page */

View File

@ -103,12 +103,6 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
#if QT_VERSION < 0x040600 #if QT_VERSION < 0x040600
ui.minimumContrastLabel->hide(); ui.minimumContrastLabel->hide();
ui.minimumContrast->hide(); ui.minimumContrast->hide();
#endif
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif #endif
} }
@ -131,7 +125,7 @@ ChatPage::save(QString &/*errmsg*/)
Settings->setChatSendMessageWithCtrlReturn(ui.sendMessageWithCtrlReturn->isChecked()); Settings->setChatSendMessageWithCtrlReturn(ui.sendMessageWithCtrlReturn->isChecked());
Settings->setChatSearchShowBarByDefault(ui.cbSearch_ShowBar->isChecked()); Settings->setChatSearchShowBarByDefault(ui.cbSearch_ShowBar->isChecked());
Settings->setChatSearchCharToStartSearch(ui.sbSearch_CharToStart->value()); Settings->setChatSearchCharToStartSearch(ui.sbSearch_CharToStart->value());
Settings->setChatSearchCaseSensitively(ui.cbSearch_CaseSensitively->isChecked()); Settings->setChatSearchCaseSensitively(ui.cbSearch_CaseSensitively->isChecked());
Settings->setChatSearchWholeWords(ui.cbSearch_WholeWords->isChecked()); Settings->setChatSearchWholeWords(ui.cbSearch_WholeWords->isChecked());
@ -234,7 +228,7 @@ ChatPage::load()
ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn()); ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn());
ui.cbSearch_ShowBar->setChecked(Settings->getChatSearchShowBarByDefault()); ui.cbSearch_ShowBar->setChecked(Settings->getChatSearchShowBarByDefault());
ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch()); ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch());
ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively()); ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively());
ui.cbSearch_WholeWords->setChecked(Settings->getChatSearchWholeWords()); ui.cbSearch_WholeWords->setChecked(Settings->getChatSearchWholeWords());

View File

@ -53,10 +53,6 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
// hide profile manager as it causes bugs when generating a new profile. // hide profile manager as it causes bugs when generating a new profile.
//ui.profile_Button->hide() ; //ui.profile_Button->hide() ;
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager()));
ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime())); ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));

View File

@ -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(clickedRememberHashes(bool)));
connect(ui.rememberHashesCB, SIGNAL(clicked(bool)), this, SLOT(toggleRememberHashes())); connect(ui.rememberHashesCB, SIGNAL(clicked(bool)), this, SLOT(toggleRememberHashes()));
connect(ui.autoCheckDirectories_CB, SIGNAL(clicked(bool)), this, SLOT(toggleAutoCheckDirectories(bool))); connect(ui.autoCheckDirectories_CB, SIGNAL(clicked(bool)), this, SLOT(toggleAutoCheckDirectories(bool)));
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void DirectoriesPage::clearHashCache() void DirectoriesPage::clearHashCache()

View File

@ -137,11 +137,6 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags)
//To get ChatLobbyUserNotify Settings //To get ChatLobbyUserNotify Settings
if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast<ChatLobbyUserNotify*>(*it); if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast<ChatLobbyUserNotify*>(*it);
} }
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
NotifyPage::~NotifyPage() NotifyPage::~NotifyPage()

View File

@ -51,12 +51,6 @@ RelayPage::RelayPage(QWidget * parent, Qt::WindowFlags flags)
QObject::connect(ui.enableCheckBox,SIGNAL(stateChanged(int)),this,SLOT(updateEnabled())); QObject::connect(ui.enableCheckBox,SIGNAL(stateChanged(int)),this,SLOT(updateEnabled()));
QObject::connect(ui.serverCheckBox,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 QString RelayPage::helpText() const

View File

@ -107,11 +107,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
ui.torpage_incoming->setVisible(false); ui.torpage_incoming->setVisible(false);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
#ifdef SERVER_DEBUG #ifdef SERVER_DEBUG
std::cerr << "ServerPage::ServerPage() called"; std::cerr << "ServerPage::ServerPage() called";
std::cerr << std::endl; std::cerr << std::endl;

View File

@ -38,11 +38,6 @@ ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags
ui.setupUi(this); ui.setupUi(this);
//QObject::connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem *)), this, SLOT(tableItemChanged(QTableWidgetItem *))); //QObject::connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem *)), this, SLOT(tableItemChanged(QTableWidgetItem *)));
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
QString ServicePermissionsPage::helpText() const QString ServicePermissionsPage::helpText() const

View File

@ -60,10 +60,6 @@ SoundPage::SoundPage(QWidget * parent, Qt::WindowFlags flags)
#endif #endif
ui.eventTreeWidget->setTextElideMode(Qt::ElideMiddle); ui.eventTreeWidget->setTextElideMode(Qt::ElideMiddle);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
SoundPage::~SoundPage() SoundPage::~SoundPage()

View File

@ -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) ) ); 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()) ; ui._max_tr_up_per_sec_SB->setValue(rsTurtle->getMaxTRForwardRate()) ;
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void TransferPage::updateMaxTRUpRate(int b) void TransferPage::updateMaxTRUpRate(int b)
{ {

View File

@ -85,12 +85,6 @@ ExampleDialog::ExampleDialog(QWidget *parent)
_header->resizeSection ( 8, 100 ); _header->resizeSection ( 8, 100 );
_header->resizeSection ( 9, 100 ); _header->resizeSection ( 9, 100 );
_header->resizeSection ( 10, 100 ); _header->resizeSection ( 10, 100 );
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point ) void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point )

View File

@ -105,12 +105,6 @@ GamesDialog::GamesDialog(QWidget *parent)
// _header->resizeSection ( 8, 100 ); // _header->resizeSection ( 8, 100 );
// _header->resizeSection ( 9, 100 ); // _header->resizeSection ( 9, 100 );
// _header->resizeSection ( 10, 100 ); // _header->resizeSection ( 10, 100 );
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }

View File

@ -77,11 +77,6 @@ LibraryDialog::LibraryDialog(QWidget *parent)
/*QTimer *timer = new QTimer(this); /*QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000);*/ timer->start(1000);*/
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }

View File

@ -112,12 +112,6 @@ PhotoDialog::PhotoDialog(QWidget *parent)
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000); timer->start(1000);
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void PhotoDialog::checkUpdate() void PhotoDialog::checkUpdate()

View File

@ -53,13 +53,6 @@ PhotoShow::PhotoShow(QWidget *parent)
//connect( ui.photoTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem * , QTreeWidgetItem * ) ), this, SLOT( displayPhoto( ) ) ); //connect( ui.photoTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem * , QTreeWidgetItem * ) ), this, SLOT( displayPhoto( ) ) );
//connect( ui.addButton, SIGNAL( clicked( ) ), this, SLOT( addPhotos( ) ) ); //connect( ui.addButton, SIGNAL( clicked( ) ), this, SLOT( addPhotos( ) ) );
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void PhotoShow::photoCustomPopupMenu( QPoint point ) void PhotoShow::photoCustomPopupMenu( QPoint point )

View File

@ -40,11 +40,6 @@ ProfileEdit::ProfileEdit(QWidget *parent)
connect(ui.moveDownButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveDown())); connect(ui.moveDownButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveDown()));
connect(ui.moveUpButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveUp())); connect(ui.moveUpButton, SIGNAL(clicked()), this, SLOT(profileEntryMoveUp()));
connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(close())); connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(close()));
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
void ProfileEdit::profileCustomPopupMenu( QPoint /*point*/ ) void ProfileEdit::profileCustomPopupMenu( QPoint /*point*/ )

View File

@ -49,11 +49,6 @@ ProfileView::ProfileView(QWidget *parent)
connect(ui.profileditButton, SIGNAL(clicked()), this, SLOT(profileEdit())); connect(ui.profileditButton, SIGNAL(clicked()), this, SLOT(profileEdit()));
loadAvatar(); loadAvatar();
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
} }
/** context popup menus */ /** context popup menus */