mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove all >= Qt 4.7 ifdefs

Browse source
This commit is contained in:
Daniel Molkentin 2013-07-24 15:34:37 +02:00
parent 810024f4c9
commit 8c15839753
4 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mirall/application.cpp
View file

@ -97,9 +97,7 @@ QString applicationTrPath()
Application::Application(int &argc, char **argv) :
SharedTools::QtSingleApplication(argc, argv),
_tray(0),
#if QT_VERSION >= 0x040700
_networkMgr(new QNetworkConfigurationManager(this)),
#endif
_sslErrorDialog(0),
_contextMenu(0),
_theme(Theme::instance()),
@ -143,12 +141,10 @@ Application::Application(int &argc, char **argv) :
qRegisterMetaType<Progress::Kind>("Progress::Kind");
#if 0
#if QT_VERSION >= 0x040700
qDebug() << "* Network is" << (_networkMgr->isOnline() ? "online" : "offline");
foreach (const QNetworkConfiguration& netCfg, _networkMgr->allConfigurations(QNetworkConfiguration::Active)) {
//qDebug() << "Network:" << netCfg.identifier();
}
#endif
#endif
MirallConfigFile cfg;

2
src/mirall/application.h
View file

@ -112,9 +112,7 @@ private:
QAction *_actionHelp;
QAction *_actionQuit;
#if QT_VERSION >= 0x040700
QNetworkConfigurationManager *_networkMgr;
#endif
QPointer<FolderWizard> _folderWizard;
SslErrorDialog *_sslErrorDialog;

4
src/mirall/folderwizard.cpp
View file

@ -43,10 +43,6 @@ FolderWizardSourcePage::FolderWizardSourcePage()
_ui.aliasLineEdit->setText( Theme::instance()->appNameGUI() );
_ui.warnLabel->hide();
#if QT_VERSION >= 0x040700
_ui.localFolderLineEdit->setPlaceholderText(QApplication::translate("FolderWizardSourcePage", "/home/local1", 0, QApplication::UnicodeUTF8));
_ui.aliasLineEdit->setPlaceholderText(QApplication::translate("FolderWizardSourcePage", "Music", 0, QApplication::UnicodeUTF8));
#endif
}
FolderWizardSourcePage::~FolderWizardSourcePage()

2
src/mirall/generalsettings.cpp
View file

@ -30,11 +30,9 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
{
_ui->setupUi(this);
#if QT_VERSION >= 0x040700
_ui->hostLineEdit->setPlaceholderText(tr("Hostname of proxy server"));
_ui->userLineEdit->setPlaceholderText(tr("Username for proxy server"));
_ui->passwordLineEdit->setPlaceholderText(tr("Password for proxy server"));
#endif
_ui->typeComboBox->addItem(tr("HTTP(S) proxy"), QNetworkProxy::HttpProxy);
_ui->typeComboBox->addItem(tr("SOCKS5 proxy"), QNetworkProxy::Socks5Proxy);