From 8c1583975320c70a763ad49c3263f96c666cb417 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Wed, 24 Jul 2013 15:34:37 +0200
Subject: [PATCH] Remove all >= Qt 4.7 ifdefs

---
 src/mirall/application.cpp     | 4 ----
 src/mirall/application.h       | 2 --
 src/mirall/folderwizard.cpp    | 4 ----
 src/mirall/generalsettings.cpp | 2 --
 4 files changed, 12 deletions(-)

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 1299308ec..22252c9a4 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -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;
diff --git a/src/mirall/application.h b/src/mirall/application.h
index 14e4e24de..0d34f89c9 100644
--- a/src/mirall/application.h
+++ b/src/mirall/application.h
@@ -112,9 +112,7 @@ private:
     QAction *_actionHelp;
     QAction *_actionQuit;
 
-#if QT_VERSION >= 0x040700
     QNetworkConfigurationManager *_networkMgr;
-#endif
 
     QPointer<FolderWizard> _folderWizard;
     SslErrorDialog *_sslErrorDialog;
diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index 57eca3940..74e8eaaf5 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -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()
diff --git a/src/mirall/generalsettings.cpp b/src/mirall/generalsettings.cpp
index 4f03d5be9..85c1980b7 100644
--- a/src/mirall/generalsettings.cpp
+++ b/src/mirall/generalsettings.cpp
@@ -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);