remove qt4 code

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 8fa1f3ba495620cdf6172572995992e240f4ec4a..60d54a1c448ff8341a167d42eaea52d303a896d2 100644 (file)
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -510,12 +510,8 @@ restart_sync:
     SyncEngine engine(account, options.source_dir, folder, &db);
     engine.setIgnoreHiddenFiles(options.ignoreHiddenFiles);
     engine.setNetworkLimits(options.uplimit, options.downlimit);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QObject::connect(&engine, &SyncEngine::finished,
         [&app](bool result) { app.exit(result ? EXIT_SUCCESS : EXIT_FAILURE); });
-#else
-    QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
-#endif
     QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));
 
 

diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index f55fbea4ea5a6ce1b59cf07df2a4300014809057..b3b7df19e5e6ef8c7fc4820924c2783b38cbf9ae 100644 (file)
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -33,17 +33,9 @@
 #include <QThread>
 #include <QDateTime>
 #include <QSysInfo>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#include <QTextDocument>
-#else
 #include <QStandardPaths>
-#endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
 #include <QCollator>
-#endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
 #include <QSysInfo>
-#endif
 
 
 #ifdef Q_OS_UNIX
@@ -248,23 +240,9 @@ QString Utility::compactFormatDouble(double value, int prec, const QString &unit
 
 QString Utility::escape(const QString &in)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    return Qt::escape(in);
-#else
     return in.toHtmlEscaped();
-#endif
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// In Qt 4,  QThread::sleep functions are protected.
-// This is a hack to make them visible in this namespace.
-struct QThread : ::QThread
-{
-    using ::QThread::sleep;
-    using ::QThread::usleep;
-};
-#endif
-
 void Utility::sleep(int sec)
 {
     QThread::sleep(sec);
@@ -408,22 +386,7 @@ bool Utility::hasDarkSystray()
 
 QString Utility::platformName()
 {
-    QString re("Windows");
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    if (isMac()) {
-        re = QLatin1String("MacOSX");
-    } else if (isLinux()) {
-        re = QLatin1String("Linux");
-    } else if (isBSD()) {
-        re = QLatin1String("BSD");
-    } else if (isUnix()) {
-        re = QLatin1String("Unix");
-    }
-#else
-    re = QSysInfo::prettyProductName();
-#endif
-    return re;
+    return QSysInfo::prettyProductName();
 }
 
 void Utility::crash()
@@ -553,16 +516,10 @@ quint64 Utility::StopWatch::durationOfLap(const QString &lapName) const
 
 void Utility::sortFilenames(QStringList &fileNames)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
     QCollator collator;
     collator.setNumericMode(true);
     collator.setCaseSensitivity(Qt::CaseInsensitive);
     qSort(fileNames.begin(), fileNames.end(), collator);
-#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    fileNames.sort(Qt::CaseInsensitive);
-#else
-    fileNames.sort();
-#endif
 }
 
 QUrl Utility::concatUrlPath(const QUrl &url, const QString &concatPath,

diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp
index eecef177889acf1e95c090d0bd2fc20a52a57944..2ccc88b9c12cf2cd8008815eb41e6a1f69e93e79 100644 (file)
--- a/src/common/utility_unix.cpp
+++ b/src/common/utility_unix.cpp
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QStandardPaths>
-#endif
 
 namespace OCC {
 
@@ -42,15 +40,7 @@ static void setupFavLink_private(const QString &folder)
 // and respects the XDG_CONFIG_HOME env variable
 QString getUserAutostartDir_private()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QString config = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
-#else
-    QString config = QFile::decodeName(qgetenv("XDG_CONFIG_HOME"));
-
-    if (config.isEmpty()) {
-        config = QDir::homePath() + QLatin1String("/.config");
-    }
-#endif
     config += QLatin1String("/autostart/");
     return config;
 }

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 453ace4129a4f2939ed168c4f4947b52d5c2ade3..f40a388895f64ade04f44f2afb5a4a396303e214 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -221,13 +221,9 @@ QString AccountSettings::selectedFolderAlias() const
 
 void AccountSettings::slotOpenAccountWizard()
 {
-    if (
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-        qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" ||
-// We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
-// (issue #4693, #4944)
-#endif
-        QSystemTrayIcon::isSystemTrayAvailable()) {
+    // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
+    // (issue #4693, #4944)
+    if (qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" || QSystemTrayIcon::isSystemTrayAvailable()) {
         topLevelWidget()->close();
     }
 #ifdef Q_OS_MAC

diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
index 05af4a8e3456c491f51802fd226b9bc467a7da8b..f03153483b2ce7dda65224b16dee1f94f5b5f454 100644 (file)
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -29,10 +29,6 @@
 #include "activitydata.h"
 #include "activitylistmodel.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_DECLARE_METATYPE(QPointer<OCC::AccountState>)
-#endif
-
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcActivity, "gui.activity", QtInfoMsg)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index d9acc999f08004bfb7f6223fde5a4662cf197b86..3d1b9047a726b1940ff51250fe879fbcd62a6557 100644 (file)
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -13,9 +13,7 @@
  */
 
 #include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets>
-#endif
 
 #include "activitylistmodel.h"
 #include "activitywidget.h"
@@ -269,9 +267,7 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList &list)
 
             _notificationsLayout->addWidget(widget);
 // _ui->_notifyScroll->setMinimumHeight( widget->height());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
             _ui->_notifyScroll->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
-#endif
             _widgetForNotifId[activity.ident()] = widget;
             newNotificationShown = true;
         }

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 37d24cec7f61587aebebdb61d64a50810b73952b..c3521a9b648b9d3f68ee7690b72bdb7a395cff9b 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -122,9 +122,7 @@ Application::Application(int &argc, char **argv)
     setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
     setApplicationName(_theme->appNameGUI());
     setWindowIcon(_theme->applicationIcon());
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
     setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-#endif
 
     parseOptions(arguments());
     //no need to waste time;
@@ -134,15 +132,6 @@ Application::Application(int &argc, char **argv)
     if (isRunning())
         return;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
-    // Workaround for QTBUG-44576: Make sure a stale QSettings lock file
-    // is deleted. (Introduced in Qt 5.4.0 and fixed in Qt 5.4.2)
-    {
-        QString lockFilePath = ConfigFile().configFile() + QLatin1String(".lock");
-        QLockFile(lockFilePath).removeStaleLockFile();
-    }
-#endif
-
 #if defined(WITH_CRASHREPORTER)
     if (ConfigFile().crashReporter())
         _crashHandler.reset(new CrashReporter::Handler(QDir::tempPath(), true, CRASHREPORTER_EXECUTABLE));
@@ -507,9 +496,7 @@ void Application::showVersion()
     stream << "Git revision " << GIT_SHA1 << endl;
 #endif
     stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl;
-#endif
 
     displayHelpText(helpText);
 }
@@ -604,10 +591,6 @@ void Application::setupTranslations()
         if (property("ui_lang").isNull())
             setProperty("ui_lang", "C");
     }
-// Work around Qt 5 < 5.5.0 regression, see https://bugreports.qt.io/browse/QTBUG-43447
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    setLayoutDirection(QApplication::tr("QT_LAYOUT_DIRECTION") == QLatin1String("RTL") ? Qt::RightToLeft : Qt::LeftToRight);
-#endif
 }
 
 bool Application::giveHelp()

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index ee1a84869d7433a15559f41796396378305ea1aa..f5374b257c03f11dd81b8e349d22c1e352153322 100644 (file)
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -739,9 +739,7 @@ void Folder::slotSyncFinished(bool success)
 {
     qCInfo(lcFolder) << "Client version" << qPrintable(Theme::instance()->version())
                      << " Qt" << qVersion()
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
                      << " SSL " << QSslSocket::sslLibraryVersionString().toUtf8().data()
-#endif
         ;
 
     bool syncError = !_syncResult.errorStrings().isEmpty();

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 1d5ad0a14982aa271bf68a2a1cc29f351adceada..23606c32451bf5f30790d8b367ad985da0f9ba78 100644 (file)
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -138,12 +138,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         opt.rect.setWidth(qMin(opt.rect.width(), hint.width()));
         opt.rect.adjust(0, aliasMargin, 0, -aliasMargin);
         opt.rect = QStyle::visualRect(option.direction, option.rect, opt.rect);
-        QApplication::style()->drawControl(QStyle::CE_PushButton, &opt, painter
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-            ,
-            option.widget
-#endif
-            );
+        QApplication::style()->drawControl(QStyle::CE_PushButton, &opt, painter, option.widget);
         return;
     }
 
@@ -308,11 +303,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         pBRect.setHeight(barHeight);
         pBRect.setWidth(overallWidth - 2 * margin);
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-        QStyleOptionProgressBarV2 pBarOpt;
-#else
         QStyleOptionProgressBar pBarOpt;
-#endif
 
         pBarOpt.state = option.state | QStyle::State_Horizontal;
         pBarOpt.minimum = 0;

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 59ad76589ea943bc0f4c877b9f0a2193d2fade23..16e2ab0e0af09b223c47b057ab4db7c491753d24 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -110,9 +110,7 @@ Qt::ItemFlags FolderStatusModel::flags(const QModelIndex &index) const
     switch (classify(index)) {
     case AddButton: {
         Qt::ItemFlags ret;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         ret = Qt::ItemNeverHasChildren;
-#endif
         if (!_accountState->isConnected()) {
             return ret;
         } else if (_folders.count() == 1) {
@@ -125,11 +123,7 @@ Qt::ItemFlags FolderStatusModel::flags(const QModelIndex &index) const
         return Qt::ItemIsEnabled | ret;
     }
     case FetchLabel:
-        return Qt::ItemIsEnabled
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
-            | Qt::ItemNeverHasChildren
-#endif
-            ;
+        return Qt::ItemIsEnabled | Qt::ItemNeverHasChildren;
     case RootFolder:
         return Qt::ItemIsEnabled;
     case SubFolder:

diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index 02bb09618d62c2ea6c88fabf81c2dabe6412269a..7cdf49c7f9480f544cac80c1c518eab4a1c4c8b7 100644 (file)
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -163,14 +163,6 @@ private:
      */
     QMap<QPersistentModelIndex, QElapsedTimer> _fetchingItems;
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    //the roles argument was added in Qt5
-    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>())
-    {
-        emit QAbstractItemModel::dataChanged(topLeft, bottomRight);
-    }
-#endif
-
 signals:
     void dirtyChanged();
 

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 168f60d88a96e57165752cc3eca74a9f053deb8f..26ce66dfdd1fafe836116e4f5c25f29e567b2d4f 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -161,11 +161,9 @@ FolderWizardRemotePath::FolderWizardRemotePath(const AccountPtr &account)
     _lscolTimer.setSingleShot(true);
     connect(&_lscolTimer, SIGNAL(timeout()), SLOT(slotLsColFolderEntry()));
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     _ui.folderTreeWidget->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
     // Make sure that there will be a scrollbar when the contents is too wide
     _ui.folderTreeWidget->header()->setStretchLastSection(false);
-#endif
 }
 
 void FolderWizardRemotePath::slotAddRemoteFolder()

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index a79036771ce060ffd5df621aabd8a42276832abd..d298b6caebb8ab54f46f4cc2a411d0fd1d25a3fb 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -103,12 +103,7 @@ QSize GeneralSettings::sizeHint() const
 
 void GeneralSettings::loadMiscSettings()
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    QScopedValueRollback<bool> scope(_currentlyLoading);
-    _currentlyLoading = true;
-#else
     QScopedValueRollback<bool> scope(_currentlyLoading, true);
-#endif
     ConfigFile cfgFile;
     _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
     _ui->desktopNotificationsCheckBox->setChecked(cfgFile.optionalDesktopNotifications());

diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp
index f434f3cd276261040bd7d8efaa67cb3b0be2f1ee..19e69c01456d2baee572927ed8e8baaa9501ef22 100644 (file)
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -13,9 +13,7 @@
  */
 
 #include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets>
-#endif
 
 #include "issueswidget.h"
 #include "configfile.h"

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 4ee4201abc846b4b351188ff72b4bff583c522c0..ba3947f14f0842a6f400d1c6d3ee6ef5581fabc4 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char **argv)
 // We do not define it on linux so the behaviour is kept the same
 // as other Qt apps in the desktop environment. (which may or may
 // not set this envoronment variable)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
-#else
-    qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); // See #4840, #4994
-#endif
 #endif // !Q_OS_WIN
 
 #ifdef Q_OS_MAC
@@ -132,11 +128,9 @@ int main(int argc, char **argv)
         }
         return 0;
     }
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+    // We can't call isSystemTrayAvailable with appmenu-qt5 begause it hides the systemtray
+    // (issue #4693)
     if (qgetenv("QT_QPA_PLATFORMTHEME") != "appmenu-qt5")
-// We can't call isSystemTrayAvailable with appmenu-qt5 begause it hides the systemtray
-// (issue #4693)
-#endif
     {
         if (!QSystemTrayIcon::isSystemTrayAvailable()) {
             // If the systemtray is not there, we will wait one second for it to maybe start

diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
index 2f35614a1c8c3dc49920d7314e500a94ad628327..b135bbea23ff5352a311778a1739065058f311a8 100644 (file)
--- a/src/gui/networksettings.cpp
+++ b/src/gui/networksettings.cpp
@@ -125,27 +125,6 @@ void NetworkSettings::loadBWLimitSettings()
 {
     ConfigFile cfgFile;
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 3)
-    // QNAM bandwidth limiting only works with versions of Qt greater or equal to 5.3.3
-    // (It needs Qt commits 097b641 and b99fa32)
-
-    const char *v = qVersion(); // "x.y.z";
-    if (QLatin1String(v) < QLatin1String("5.3.3")) {
-        QString tooltip = tr("Qt >= 5.4 is required in order to use the bandwidth limit");
-        _ui->downloadBox->setEnabled(false);
-        _ui->uploadBox->setEnabled(false);
-        _ui->downloadBox->setToolTip(tooltip);
-        _ui->uploadBox->setToolTip(tooltip);
-        _ui->noDownloadLimitRadioButton->setChecked(true);
-        _ui->noUploadLimitRadioButton->setChecked(true);
-        if (cfgFile.useUploadLimit() != 0 || cfgFile.useDownloadLimit() != 0) {
-            // Update from old mirall that was using neon propagator jobs.
-            saveBWLimitSettings();
-        }
-        return;
-    }
-
-#endif
     int useDownloadLimit = cfgFile.useDownloadLimit();
     if (useDownloadLimit >= 1) {
         _ui->downloadLimitRadioButton->setChecked(true);

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index c55ab67899d42bfd81f47787c5e39a65e58511a2..b2c82ce3c306e4d4a8585ad555b04071c687c00d 100644 (file)
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -13,9 +13,7 @@
  */
 
 #include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets>
-#endif
 
 #include "protocolwidget.h"
 #include "configfile.h"

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 1663ca4817458114a0c1a8445d14d4c9c2e062a3..a9c96cb779371e055f960bb68ceebff2f1dc42a5 100644 (file)
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -90,12 +90,8 @@ SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent)
     _folderTree->setSortingEnabled(true);
     _folderTree->sortByColumn(0, Qt::AscendingOrder);
     _folderTree->setColumnCount(2);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     _folderTree->header()->setSectionResizeMode(0, QHeaderView::QHeaderView::ResizeToContents);
     _folderTree->header()->setSectionResizeMode(1, QHeaderView::QHeaderView::ResizeToContents);
-#else
-    _folderTree->header()->resizeSection(0, sizeHint().width() / 2);
-#endif
     _folderTree->header()->setStretchLastSection(true);
     _folderTree->headerItem()->setText(0, tr("Name"));
     _folderTree->headerItem()->setText(1, tr("Size"));

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index f21ecd5f8f75d9d65fb53a1230cc76b9733c3d0b..2ea52e921240d784d97102225640f4fa01277bcf 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -179,9 +179,7 @@ void SettingsDialog::changeEvent(QEvent *e)
     switch (e->type()) {
     case QEvent::StyleChange:
     case QEvent::PaletteChange:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     case QEvent::ThemeChange:
-#endif
         customizeStyle();
         break;
     default:

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 11a9711288e8fa0b084a2246a9fd59061f71513e..fe7ca5f4d5eb3dbfe05612bc329da075440191b8 100644 (file)
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -50,10 +50,7 @@
 
 #include <sqlite3.h>
 
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QStandardPaths>
-#endif
 
 
 // This is the version that is returned when the client asks for the VERSION.
@@ -188,16 +185,7 @@ SocketApi::SocketApi(QObject *parent)
         socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi";
     } else if (Utility::isLinux() || Utility::isBSD()) {
         QString runtimeDir;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
-#else
-        runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
-        if (runtimeDir.isEmpty()) {
-            runtimeDir = QDir::tempPath() + QLatin1String("/runtime-")
-                + QString::fromLocal8Bit(qgetenv("USER"));
-            QDir().mkdir(runtimeDir);
-        }
-#endif
         socketPath = runtimeDir + "/" + Theme::instance()->appName() + "/socket";
     } else {
         qCWarning(lcSocketApi) << "An unexpected system detected, this probably won't work.";

diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index cf6a2af7d69e0d220a5052c12c53661fc495faee..e6c87e1f3fb25e2e0591a95fac3d7bf624eeb5e7 100644 (file)
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -84,15 +84,11 @@ QMenu *SslButton::buildCertMenu(QMenu *parent, const QSslCertificate &cert,
     if (issuer.isEmpty())
         issuer = QStringList(cert.issuerInfo(QSslCertificate::OrganizationalUnitName)).join(QChar(';'));
     QString sha1 = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha1).toHex(), false);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    QString md5 = Utility::formatFingerprint(cert.digest(QCryptographicHash::Md5).toHex(), false);
-#else
     QByteArray sha265hash = cert.digest(QCryptographicHash::Sha256).toHex();
     QString sha256escaped =
         Utility::escape(Utility::formatFingerprint(sha265hash.left(sha265hash.length() / 2), false))
         + QLatin1String("<br/>")
         + Utility::escape(Utility::formatFingerprint(sha265hash.mid(sha265hash.length() / 2), false));
-#endif
     QString serial = QString::fromUtf8(cert.serialNumber());
     QString effectiveDate = cert.effectiveDate().date().toString();
     QString expiryDate = cert.expiryDate().date().toString();
@@ -126,11 +122,8 @@ QMenu *SslButton::buildCertMenu(QMenu *parent, const QSslCertificate &cert,
     stream << tr("<h3>Fingerprints</h3>");
 
     stream << QLatin1String("<table>");
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    stream << addCertDetailsField(tr("MD 5:"), Utility::escape(md5));
-#else
+
     stream << addCertDetailsField(tr("SHA-256:"), sha256escaped);
-#endif
     stream << addCertDetailsField(tr("SHA-1:"), Utility::escape(sha1));
     stream << QLatin1String("</table>");
 
@@ -218,11 +211,9 @@ void SslButton::slotUpdateMenu()
             + ", " + account->_sessionCipher.encryptionMethod();
         _menu->addAction(sslVersion)->setEnabled(false);
 
-#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
         if (account->_sessionTicket.isEmpty()) {
             _menu->addAction(tr("No support for SSL session tickets/identifiers"))->setEnabled(false);
         }
-#endif
 
         QList<QSslCertificate> chain = account->_peerCertificateChain;
 

diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index 809be80aa60aae8229e439012aa92540d7e5132f..83ebcffe8f8c8e5682cc10713d1a60aee73c509c 100644 (file)
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -16,9 +16,7 @@
 
 #include <QtGui>
 #include <QtNetwork>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets>
-#endif
 
 
 #include "ui_sslerrordialog.h"
@@ -27,12 +25,10 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcSslErrorDialog, "gui.sslerrordialog", QtInfoMsg)
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 namespace Utility {
     //  Used for QSSLCertificate::subjectInfo which returns a QStringList in Qt5, but a QString in Qt4
     QString escape(const QStringList &l) { return escape(l.join(';')); }
 }
-#endif
 
 bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr account)
 {

diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index b904ed189a7e0b1de55cb278666797f9befcb6b9..f1b3e1efde9109101b6788d224e58bc54566566e 100644 (file)
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -23,9 +23,7 @@
 #include <QtCore>
 #include <QtNetwork>
 #include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWidgets>
-#endif
 
 #include <stdio.h>
 

diff --git a/src/gui/wizard/owncloudconnectionmethoddialog.cpp b/src/gui/wizard/owncloudconnectionmethoddialog.cpp
index 6bb865ffeecb64c5806b609be2f222517d32ac1f..3e40f1546a4b095c958280cb2967580ffdb3e849 100644 (file)
--- a/src/gui/wizard/owncloudconnectionmethoddialog.cpp
+++ b/src/gui/wizard/owncloudconnectionmethoddialog.cpp
@@ -27,22 +27,11 @@ OwncloudConnectionMethodDialog::OwncloudConnectionMethodDialog(QWidget *parent)
     connect(ui->btnNoTLS, SIGNAL(clicked(bool)), this, SLOT(returnNoTLS()));
     connect(ui->btnClientSideTLS, SIGNAL(clicked(bool)), this, SLOT(returnClientSideTLS()));
     connect(ui->btnBack, SIGNAL(clicked(bool)), this, SLOT(returnBack()));
-
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    // We support only from Qt 5.4.x because of https://doc.qt.io/qt-5/qsslcertificate.html#importPkcs12
-    ui->btnClientSideTLS->hide();
-#endif
 }
 
 void OwncloudConnectionMethodDialog::setUrl(const QUrl &url)
 {
-    ui->label->setText(tr("<html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html>")
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-                           .arg(OCC::Utility::escape(url.toString())));
-#else
-                           .arg(url.toDisplayString().toHtmlEscaped()));
-#endif
+    ui->label->setText(tr("<html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html>").arg(url.toDisplayString().toHtmlEscaped()));
 }
 
 

diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 39afeecfceef635785c39d341e53f59ae26fe6a4..31a3bbc8ed355414d180dc76ad613673f8cd48cd 100644 (file)
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -267,10 +267,8 @@ void OwncloudSetupPage::setErrorString(const QString &err, bool retryHTTPonly)
                     wizard()->next();
                 } break;
                 case OwncloudConnectionMethodDialog::Client_Side_TLS:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
                     addCertDial->show();
                     connect(addCertDial, SIGNAL(accepted()), this, SLOT(slotCertificateAccepted()));
-#endif
                     break;
                 case OwncloudConnectionMethodDialog::Closed:
                 case OwncloudConnectionMethodDialog::Back:
@@ -305,17 +303,12 @@ void OwncloudSetupPage::stopSpinner()
 
 QString subjectInfoHelper(const QSslCertificate &cert, const QByteArray &qa)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    return cert.subjectInfo(qa);
-#else
     return cert.subjectInfo(qa).join(QLatin1Char('/'));
-#endif
 }
 
 //called during the validation of the client certificate.
 void OwncloudSetupPage::slotCertificateAccepted()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
     QList<QSslCertificate> clientCaCertificates;
     QFile certFile(addCertDial->getCertificatePath());
     certFile.open(QFile::ReadOnly);
@@ -344,7 +337,6 @@ void OwncloudSetupPage::slotCertificateAccepted()
         addCertDial->showErrorMessage("Could not load certificate");
         addCertDial->show();
     }
-#endif
 }
 
 OwncloudSetupPage::~OwncloudSetupPage()

diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp
index 9c60da8f9ca0166b138335c6c0578ac2a7ef91b2..070a0e68951b16201669866d5af1c09d17989fe9 100644 (file)
--- a/src/libsync/abstractnetworkjob.cpp
+++ b/src/libsync/abstractnetworkjob.cpp
@@ -103,9 +103,7 @@ void AbstractNetworkJob::setPath(const QString &path)
 void AbstractNetworkJob::setupConnections(QNetworkReply *reply)
 {
     connect(reply, SIGNAL(finished()), SLOT(slotFinished()));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
     connect(reply, SIGNAL(encrypted()), SIGNAL(networkActivity()));
-#endif
     connect(reply->manager(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy, QAuthenticator *)), SIGNAL(networkActivity()));
     connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SIGNAL(networkActivity()));
     connect(reply, SIGNAL(metaDataChanged()), SIGNAL(networkActivity()));
@@ -364,13 +362,7 @@ QString networkReplyErrorString(const QNetworkReply &reply)
         return base;
     }
 
-    return AbstractNetworkJob::tr("Server replied \"%1 %2\" to \"%3 %4\"").arg(QString::number(httpStatus), httpReason, requestVerb(reply),
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-        reply.request().url().toString()
-#else
-        reply.request().url().toDisplayString()
-#endif
-            );
+    return AbstractNetworkJob::tr("Server replied \"%1 %2\" to \"%3 %4\"").arg(QString::number(httpStatus), httpReason, requestVerb(reply), reply.request().url().toDisplayString());
 }
 
 } // namespace OCC

diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index 67603f623fc585be7564a0c699f007ef712ff1e0..fdfa6758a076a15cb2745d74eeac30a6ab3f0ee3 100644 (file)
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -34,7 +34,7 @@ Q_LOGGING_CATEGORY(lcAccessManager, "sync.accessmanager", QtInfoMsg)
 AccessManager::AccessManager(QObject *parent)
     : QNetworkAccessManager(parent)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
     // FIXME Workaround http://stackoverflow.com/a/15707366/2941 https://bugreports.qt-project.org/browse/QTBUG-30434
     QNetworkProxy proxy = this->proxy();
     proxy.setHostName(" ");

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 45168033f647c5679001874025e90b96c62632d1..2caa58713f2fff187d0bc052c35422cb2ffb2b79 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -261,12 +261,10 @@ QSslConfiguration Account::getOrCreateSslConfig()
     //  "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure"
     QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration();
 
-#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
     // Try hard to re-use session for different requests
     sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false);
     sslConfig.setSslOption(QSsl::SslOptionDisableSessionSharing, false);
     sslConfig.setSslOption(QSsl::SslOptionDisableSessionPersistence, false);
-#endif
 
     return sslConfig;
 }

diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index b82588f842c84cdf088a9f5c06fb4247c00899cd..82c0c768d8caf28afa8122ce8b094abb00b46619 100644 (file)
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -226,12 +226,9 @@ void HttpCredentials::slotReadClientKeyPEMJobDone(QKeychain::Job *incoming)
         if (_clientSslKey.isNull()) {
             _clientSslKey = QSslKey(clientKeyPEM, QSsl::Dsa);
         }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
-        // ec keys are Qt 5.5
         if (_clientSslKey.isNull()) {
             _clientSslKey = QSslKey(clientKeyPEM, QSsl::Ec);
         }
-#endif
         if (_clientSslKey.isNull()) {
             qCWarning(lcHttpCredentials) << "Could not load SSL key into Qt!";
         }

diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index 2e365c6088e525c2756974940f205223c2fc2f5a..b027db4d73b088e988fc1159baef731e04674ec1 100644 (file)
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -25,10 +25,6 @@
 #include <zlib.h>
 #endif
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#include <qabstractfileengine.h>
-#endif
-
 #ifdef Q_OS_WIN
 #include <windows.h>
 #include <windef.h>
@@ -300,9 +296,6 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
 #ifndef Q_OS_WIN
     bool success;
     QFile orig(originFileName);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    success = orig.fileEngine()->rename(destinationFileName);
-#else
     // We want a rename that also overwites.  QFile::rename does not overwite.
     // Qt 5.1 has QSaveFile::renameOverwrite we could use.
     // ### FIXME
@@ -316,7 +309,6 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
     if (success) {
         success = orig.rename(destinationFileName);
     }
-#endif
     if (!success) {
         *errorString = orig.errorString();
         qCWarning(lcFileSystem) << "Renaming temp file to final failed: " << *errorString;

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
index 46c2e95ba2d5e03f7aadf392c1966019c2e227b4..a0fe727e8538e00a8674ec97ccb334ea7942640c 100644 (file)
--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -26,27 +26,6 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcCsync, "sync.csync", QtInfoMsg)
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// logging handler.
-static void mirallLogCatcher(QtMsgType type, const char *msg)
-{
-    Q_UNUSED(type)
-    // qDebug() exports to local8Bit, which is not always UTF-8
-    Logger::instance()->mirallLog(QString::fromLocal8Bit(msg));
-}
-static void qInstallMessageHandler(QtMsgHandler h)
-{
-    qInstallMsgHandler(h);
-}
-#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-static void mirallLogCatcher(QtMsgType, const QMessageLogContext &ctx, const QString &message)
-{
-    QByteArray file = ctx.file;
-    file = file.mid(file.lastIndexOf('/') + 1);
-    Logger::instance()->mirallLog(QString::fromLocal8Bit(file) + QLatin1Char(':') + QString::number(ctx.line)
-        + QLatin1Char(' ') + message);
-}
-#else
 static void mirallLogCatcher(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
 {
     auto logger = Logger::instance();
@@ -54,7 +33,6 @@ static void mirallLogCatcher(QtMsgType type, const QMessageLogContext &ctx, cons
         logger->doLog(qFormatLogMessage(type, ctx, message));
     }
 }
-#endif
 
 static void csyncLogCatcher(int verbosity,
     const char *function,
@@ -91,9 +69,7 @@ Logger::Logger(QObject *parent)
     , _logExpire(0)
     , _logDebug(false)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
     qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} [ %{type} %{category} ]%{if-debug}\t[ %{function} ]%{endif}:\t%{message}");
-#endif
 #ifndef NO_MSG_HANDLER
     qInstallMessageHandler(mirallLogCatcher);
 #else
@@ -154,12 +130,8 @@ void Logger::log(Log log)
  */
 bool Logger::isNoop() const
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    return false;
-#else
     QMutexLocker lock(const_cast<QMutex *>(&_mutex));
     return !_logstream && !_logWindowActivated;
-#endif
 }
 
 

diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index c92936e3abadc80a1f01deb05d3ac95ab70d5da4..37fd1b71a2ad7f412d182aea7ac718a4165ded93 100644 (file)
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -447,11 +447,9 @@ static void mergeSslConfigurationForSslButton(const QSslConfiguration &config, A
     if (!config.sessionCipher().isNull()) {
         account->_sessionCipher = config.sessionCipher();
     }
-#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
     if (config.sessionTicket().length() > 0) {
         account->_sessionTicket = config.sessionTicket();
     }
-#endif
 }
 
 void CheckServerJob::encryptedSlot()
@@ -486,13 +484,11 @@ void CheckServerJob::metaDataChangedSlot()
 
 bool CheckServerJob::finished()
 {
-#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
     if (reply()->request().url().scheme() == QLatin1String("https")
         && reply()->sslConfiguration().sessionTicket().isEmpty()
         && reply()->error() == QNetworkReply::NoError) {
         qCWarning(lcCheckServerJob) << "No SSL session identifier / session ticket is used, this might impact sync performance negatively.";
     }
-#endif
 
     mergeSslConfigurationForSslButton(reply()->sslConfiguration(), account());
 

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index b9b60034f78553c554b524a112ca01e2ee90f0f7..21da3d72c2b3bef4d8e9439fb51cc8cf742fcc18 100644 (file)
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -450,17 +450,6 @@ private:
     AccountPtr _account;
     QScopedPointer<PropagateDirectory> _rootJob;
     SyncOptions _syncOptions;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    // access to signals which are protected in Qt4
-    friend class PropagateDownloadFile;
-    friend class PropagateItemJob;
-    friend class PropagateLocalMkdir;
-    friend class PropagateLocalRename;
-    friend class PropagateRemoteMove;
-    friend class PropagateUploadFileV1;
-    friend class PropagateUploadFileNG;
-#endif
 };
 
 

diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h
index dd75509254dc24627f8b67ff36622f45060bb1ac..a43048eb6a6294248361c4a322970bba7313290c 100644 (file)
--- a/src/libsync/propagateupload.h
+++ b/src/libsync/propagateupload.h
@@ -50,14 +50,6 @@ public:
     bool isSequential() const Q_DECL_OVERRIDE;
     bool seek(qint64 pos) Q_DECL_OVERRIDE;
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
-    bool reset() Q_DECL_OVERRIDE
-    {
-        emit wasReset();
-        return QIODevice::reset();
-    }
-#endif
-
     void setBandwidthLimited(bool);
     bool isBandwidthLimited() { return _bandwidthLimited; }
     void setChoked(bool);
@@ -65,9 +57,6 @@ public:
     void giveBandwidthQuota(qint64 bwq);
 
 signals:
-#if QT_VERSION < 0x050402
-    void wasReset();
-#endif
 
 private:
     // The file data

diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index 00e3d0524a889c278c6a6672fd4639fa8495ade6..edeb43516a8f288569014add338a0e6052444f04 100644 (file)
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -351,17 +351,6 @@ void PropagateUploadFileNG::slotPutFinished()
 
     QNetworkReply::NetworkError err = job->reply()->error();
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
-    if (err == QNetworkReply::OperationCanceledError && job->reply()->property("owncloud-should-soft-cancel").isValid()) {
-        // Abort the job and try again later.
-        // This works around a bug in QNAM wich might reuse a non-empty buffer for the next request.
-        qCWarning(lcPropagateUpload) << "Forcing job abort on HTTP connection reset with Qt < 5.4.2.";
-        propagator()->_anotherSyncNeeded = true;
-        abortWithError(SyncFileItem::SoftError, tr("Forcing job abort on HTTP connection reset with Qt < 5.4.2."));
-        return;
-    }
-#endif
-
     if (err != QNetworkReply::NoError) {
         _item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
         commonErrorHandling(job);

diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp
index c1182bb70fbbac48b8637f35e78d03466f638084..a5396c700fdf797fdc21c565a78e70b6b84faa7d 100644 (file)
--- a/src/libsync/propagateuploadv1.cpp
+++ b/src/libsync/propagateuploadv1.cpp
@@ -185,16 +185,6 @@ void PropagateUploadFileV1::slotPutFinished()
 
     QNetworkReply::NetworkError err = job->reply()->error();
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
-    if (err == QNetworkReply::OperationCanceledError && job->reply()->property("owncloud-should-soft-cancel").isValid()) { // Abort the job and try again later.
-        // This works around a bug in QNAM wich might reuse a non-empty buffer for the next request.
-        qCWarning(lcPropagateUpload) << "Forcing job abort on HTTP connection reset with Qt < 5.4.2.";
-        propagator()->_anotherSyncNeeded = true;
-        abortWithError(SyncFileItem::SoftError, tr("Forcing job abort on HTTP connection reset with Qt < 5.4.2."));
-        return;
-    }
-#endif
-
     if (err != QNetworkReply::NoError) {
         _item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
         if (checkForProblemsWithShared(_item->_httpErrorCode,

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index 1bdee68aef5218ced8b2aac3d702c4a26e60ff63..769408dfb3d87f04b25632aa4c99d04d8cb9b879 100644 (file)
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -24,11 +24,7 @@
 #include <qdir.h>
 #include <qdiriterator.h>
 #include <qtemporaryfile.h>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#include <qabstractfileengine.h>
-#else
 #include <qsavefile.h>
-#endif
 #include <QDateTime>
 #include <qstack.h>
 #include <QCoreApplication>

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 6483ca435c6e4f69f3ce5d073dc94f6e74758d16..a6599751e3f4b6228f05307a83dd15906e5641dc 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -594,7 +594,7 @@ int SyncEngine::treewalkFile(csync_file_stat_t *file, csync_file_stat_t *other,
                     // the file system in the DB, this is to avoid spurious upload on the next sync
                     item->_modtime = other->modtime;
                     // same for the size
-                    item->_size = other->size;                    
+                    item->_size = other->size;
                 }
 
                 // If the 'W' remote permission changed, update the local filesystem
@@ -676,7 +676,7 @@ int SyncEngine::treewalkFile(csync_file_stat_t *file, csync_file_stat_t *other,
         item->log._other_fileId = other->file_id;
         item->log._other_instruction = other->instruction;
         item->log._other_modtime = other->modtime;
-        item->log._other_size = other->size;        
+        item->log._other_size = other->size;
     }
 
     _syncItemMap.insert(key, item);
@@ -795,9 +795,7 @@ void SyncEngine::startSync()
     QString verStr("Using Qt ");
     verStr.append(qVersion());
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     verStr.append(" SSL library ").append(QSslSocket::sslLibraryVersionString().toUtf8().data());
-#endif
     verStr.append(" on ").append(Utility::platformName());
     qCInfo(lcEngine) << verStr;
 
@@ -1091,16 +1089,8 @@ void SyncEngine::setNetworkLimits(int upload, int download)
     _propagator->_uploadLimit = upload;
     _propagator->_downloadLimit = download;
 
-    int propDownloadLimit = _propagator->_downloadLimit
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-                                .load()
-#endif
-        ;
-    int propUploadLimit = _propagator->_uploadLimit
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-                              .load()
-#endif
-        ;
+    int propDownloadLimit = _propagator->_downloadLimit.load();
+    int propUploadLimit = _propagator->_uploadLimit.load();
 
     if (propDownloadLimit != 0 || propUploadLimit != 0) {
         qCInfo(lcEngine) << "Network Limits (down/up) " << propDownloadLimit << propUploadLimit;

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 978efc9cb7341e7c4542636c63566feea7e684c4..828bbf45e106c057e74512acd79387414c8a6a42 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -173,7 +173,6 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl
 
 QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev)
 {
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
     qreal devicePixelRatio = dev ? dev->devicePixelRatio() : qApp->primaryScreen()->devicePixelRatio();
     if (devicePixelRatio <= 1.0) {
         return fileName;
@@ -189,7 +188,6 @@ QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev)
             return at2xfileName;
         }
     }
-#endif
     return fileName;
 }
 

diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
index fd1988eabba9f8acb4f2432bd9c929cf7426fd95..d2d10096d7bdea45b3084d358be7cd68f32770ab 100644 (file)
--- a/test/testchecksumvalidator.cpp
+++ b/test/testchecksumvalidator.cpp
@@ -15,10 +15,6 @@
 #include "filesystem.h"
 #include "propagatorjobs.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// poor man QTRY_VERIFY when Qt5 is not available.
-#define QTRY_VERIFY(Cond) QTest::qWait(1000); QVERIFY(Cond)
-#endif
 
 using namespace OCC;
 
@@ -155,16 +151,6 @@ using namespace OCC;
     }
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// Qt4 does not have QTEST_GUILESS_MAIN, so we simulate it.
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-    TestChecksumValidator tc;
-    return QTest::qExec(&tc, argc, argv);
-}
-#else
     QTEST_GUILESS_MAIN(TestChecksumValidator)
-#endif
 
 #include "testchecksumvalidator.moc"

diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
index 78a2dd71a10ada0fe2f16a7d05c2b56538fec63b..39c657a0546202886dfb1f96e453e75afc2f804c 100644 (file)
--- a/test/testfolderman.cpp
+++ b/test/testfolderman.cpp
@@ -6,9 +6,7 @@
  */
 
 #include <qglobal.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
 #include <QTemporaryDir>
-#endif
 #include <QtTest>
 
 #include "common/utility.h"
@@ -49,7 +47,6 @@ class TestFolderMan: public QObject
 private slots:
     void testCheckPathValidityForNewFolder()
     {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         QTemporaryDir dir;
         ConfigFile::setConfDir(dir.path()); // we don't want to pollute the user's config file
         QVERIFY(dir.isValid());
@@ -149,14 +146,10 @@ private slots:
         // Should not have the rights
         QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
         QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
-#else
-        QSKIP("Test not supported with Qt4", SkipSingle);
-#endif
     }
 
     void testFindGoodPathForNewSyncFolder()
     {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         // SETUP
 
         QTemporaryDir dir;
@@ -197,9 +190,6 @@ private slots:
                  QString(dirPath + "/ownCloud2/bar"));
         QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath + "/sub", url),
                  QString(dirPath + "/sub2"));
-#else
-        QSKIP("Test not supported with Qt4", SkipSingle);
-#endif
     }
 };
 

diff --git a/test/testutility.cpp b/test/testutility.cpp
index 5e86a336e1ef0651fff422b5b06fa9f81beaea94..c83b141994449c8fdc9120fd0ddc13798fda40ae 100644 (file)
--- a/test/testutility.cpp
+++ b/test/testutility.cpp
@@ -5,9 +5,7 @@
 */
 
 #include <QtTest>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
 #include <QTemporaryDir>
-#endif
 
 #include "common/utility.h"
 
@@ -156,15 +154,12 @@ private slots:
         QVERIFY(fsCasePreserving());
         qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "0");
         QVERIFY(! fsCasePreserving());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING");
         QVERIFY(isMac() || isWindows() ? fsCasePreserving() : ! fsCasePreserving());
-#endif
     }
 
     void testFileNamesEqual()
     {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         QTemporaryDir dir;
         QVERIFY(dir.isValid());
         QDir dir2(dir.path());
@@ -190,7 +185,6 @@ private slots:
 
         dir.remove();
         qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING");
-#endif
     }
 
 

diff --git a/test/testxmlparse.cpp b/test/testxmlparse.cpp
index 4b7f7bd691976202b7b34d80750a9041a4e7bad5..9ec675f47ad6aeb54da7d417af09c78197b4f150 100644 (file)
--- a/test/testxmlparse.cpp
+++ b/test/testxmlparse.cpp
@@ -441,16 +441,6 @@ private slots:
 
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// Qt4 does not have QTEST_GUILESS_MAIN, so we simulate it.
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-    TestXmlParse tc;
-    return QTest::qExec(&tc, argc, argv);
-}
-#else
     QTEST_GUILESS_MAIN(TestXmlParse)
-#endif
 
 #include "testxmlparse.moc"