Remove all workarounds for Qt <5.9.0

4 files changed, 3 insertions, 118 deletions

diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index e0405ee7b0..cab99387d7 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -317,9 +317,7 @@ void TrackDAO::slotDatabaseTracksRelocated(QList<RelocatedTrack> relocatedTracks
         }
     }
     DEBUG_ASSERT(removedTrackIds.size() <= changedTrackIds.size());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     DEBUG_ASSERT(!removedTrackIds.intersects(changedTrackIds));
-#endif
     if (!removedTrackIds.isEmpty()) {
         emit tracksRemoved(removedTrackIds);
     }
diff --git a/src/main.cpp b/src/main.cpp
index fe63dad0a4..7de012be58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,10 +69,8 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setOrganizationDomain("mixxx.org");
 
     // This needs to be set before initializing the QApplication.
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
 
     // Setting the organization name results in a QDesktopStorage::DataLocation
     // of "$HOME/Library/Application Support/Mixxx/Mixxx" on OS X. Leave the
diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp
index 1dd6540199..6a9efdfccf 100644
--- a/src/network/jsonwebtask.cpp
+++ b/src/network/jsonwebtask.cpp
@@ -1,8 +1,5 @@
 #include "network/jsonwebtask.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
-#include <QBuffer>
-#endif
 #include <QMetaMethod>
 #include <QMimeDatabase>
 #include <QNetworkRequest>
@@ -10,10 +7,6 @@
 #include <QTimerEvent>
 #include <mutex> // std::once_flag
 
-#include "util/assert.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-#include "util/compatibility.h"
-#endif
 #include "util/counter.h"
 #include "util/logger.h"
 
@@ -100,9 +93,7 @@ QNetworkRequest newRequest(
         const QUrl& url) {
     QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::ContentTypeHeader, JSON_CONTENT_TYPE);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
     return request;
 }
 
@@ -207,19 +198,10 @@ QNetworkReply* JsonWebTask::sendNetworkRequest(
                     << url
                     << body;
         }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
         return networkAccessManager->sendCustomRequest(
                 newRequest(url),
                 "PATCH",
                 body);
-#else
-        auto* buffer = new QBuffer(this);
-        buffer->setData(body);
-        return networkAccessManager->sendCustomRequest(
-                newRequest(url),
-                "PATCH",
-                buffer);
-#endif
     }
     case HttpRequestMethod::Delete: {
         DEBUG_ASSERT(content.isEmpty());
@@ -274,11 +256,7 @@ bool JsonWebTask::doStart(
             Qt::UniqueConnection);
 
     connect(m_pendingNetworkReply,
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
             qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error),
-#else
-            QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error),
-#endif
             this,
             &JsonWebTask::slotNetworkReplyFinished,
             Qt::UniqueConnection);
diff --git a/src/util/compatibility.h b/src/util/compatibility.h
index 43563108e4..b5771c75b1 100644
--- a/src/util/compatibility.h
+++ b/src/util/compatibility.h
@@ -2,102 +2,24 @@
 
 #include <QCoreApplication>
 #include <QGuiApplication>
-#include <QList>
 #include <QScreen>
 #include <QUuid>
-#include <QWindow>
 #include <QWidget>
 
 #include "util/assert.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
-
-// this adds const to non-const objects (like std::as_const)
-template <typename T>
-struct QAddConst { typedef const T Type; };
-template <typename T>
-constexpr typename QAddConst<T>::Type &qAsConst(T &t) { return t; }
-// prevent rvalue arguments:
-template <typename T>
-void qAsConst(const T &&) = delete;
-
-template <typename... Args>
-struct QNonConstOverload
-{
-    template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-template <typename... Args>
-struct QConstOverload
-{
-    template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-template <typename... Args>
-struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
-{
-    using QConstOverload<Args...>::of;
-    using QConstOverload<Args...>::operator();
-    using QNonConstOverload<Args...>::of;
-    using QNonConstOverload<Args...>::operator();
-
-    template <typename R>
-    Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R>
-    static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-#endif
-
-
 inline qreal getDevicePixelRatioF(const QWidget* widget) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     return widget->devicePixelRatioF();
-#endif
-
-    // Crawl up to the window and return qreal value
-    QWindow* window = widget->window()->windowHandle();
-    if (window) {
-        return window->devicePixelRatio();
-    }
-
-    // return integer value as last resort
-    return widget->devicePixelRatio();
 }
 
 inline QScreen* getPrimaryScreen() {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QGuiApplication* app = static_cast<QGuiApplication*>(QCoreApplication::instance());
     VERIFY_OR_DEBUG_ASSERT(app) {
         qWarning() << "Unable to get applications QCoreApplication instance, cannot determine primary screen!";
-    } else {
-        return app->primaryScreen();
-    }
-#endif
-    const QList<QScreen*> screens = QGuiApplication::screens();
-    VERIFY_OR_DEBUG_ASSERT(!screens.isEmpty()) {
-        qWarning() << "No screens found, cannot determine primary screen!";
-    } else {
-        return screens.first();
+        // All attempts to find primary screen failed, return nullptr
+        return nullptr;
     }
-
-    // All attempts to find primary screen failed, return nullptr
-    return nullptr;
+    return app->primaryScreen();
 }
 
 inline
@@ -206,14 +128,3 @@ inline void atomicStoreRelaxed(QAtomicPointer<T>& atomicPtr, T* newValue) {
     atomicPtr.store(newValue);
 #endif
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-template<typename T>
-inline uint qHash(const QList<T>& key, uint seed = 0) {
-    uint hash = 0;
-    for (const auto& elem : key) {
-        hash ^= qHash(elem, seed);
-    }
-    return hash;
-}
-#endif