remove compatibility.h

src/encoder/encoderopussettings.cpp

@@ -3,7 +3,6 @@
 #include "encoder/encoderopussettings.h"
 #include "recording/defs_recording.h"
 #include "util/logger.h"
-#include "util/compatibility.h"
 
 namespace {
 const int kDefaultQualityIndex = 6;

src/library/autodj/autodjfeature.cpp

@@ -17,7 +17,6 @@
 #include "moc_autodjfeature.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/dnd.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"

src/library/autodj/dlgautodj.cpp

@@ -7,7 +7,6 @@
 #include "moc_dlgautodj.cpp"
 #include "track/track.h"
 #include "util/assert.h"
-#include "util/compatibility.h"
 #include "util/duration.h"
 #include "widget/wlibrary.h"
 #include "widget/wtracktableview.h"

src/library/basetrackcache.cpp

@@ -7,7 +7,6 @@
 #include "track/globaltrackcache.h"
 #include "track/keyutils.h"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/performancetimer.h"
 
 namespace {

src/library/basetracktablemodel.cpp

@@ -1,5 +1,11 @@
 #include "library/basetracktablemodel.h"
 
+#include <QScreen>
+// for hack to get primary screen instead of view widget's screen
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+#include <QGuiApplication>
+#endif
+
 #include "library/bpmdelegate.h"
 #include "library/colordelegate.h"
 #include "library/coverartcache.h"
@@ -16,7 +22,6 @@
 #include "moc_basetracktablemodel.cpp"
 #include "track/track.h"
 #include "util/assert.h"
-#include "util/compatibility.h"
 #include "util/datetime.h"
 #include "util/db/sqlite.h"
 #include "util/logger.h"
@@ -510,13 +515,24 @@ bool BaseTrackTableModel::setData(
 QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
         const QModelIndex& index) const {
     // Determine height of the cover art image depending on the screen size
-    const QScreen* primaryScreen = getPrimaryScreen();
-    if (!primaryScreen) {
-        DEBUG_ASSERT(!"Primary screen not found!");
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    auto* pTableView = qobject_cast<WTrackTableView*>(parent());
+    VERIFY_OR_DEBUG_ASSERT(pTableView) {
+        return QVariant();
+    }
+    QScreen* pViewScreen = pTableView->screen();
+#else
+    // Ugly hack assuming that the view is on whatever Qt considers the primary screen.
+    QGuiApplication* app = static_cast<QGuiApplication*>(QCoreApplication::instance());
+    VERIFY_OR_DEBUG_ASSERT(app) {
+        qWarning() << "Unable to get application's QGuiApplication instance, "
+                      "cannot determine primary screen";
         return QVariant();
     }
+    QScreen* pViewScreen = app->primaryScreen();
+#endif
     unsigned int absoluteHeightOfCoverartToolTip = static_cast<int>(
-            primaryScreen->availableGeometry().height() *
+            pViewScreen->availableGeometry().height() *
             kRelativeHeightOfCoverartToolTip);
     // Get image from cover art cache
     CoverArtCache* pCache = CoverArtCache::instance();

src/library/coverartcache.cpp

@@ -8,7 +8,6 @@
 #include "library/coverartutils.h"
 #include "moc_coverartcache.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/logger.h"
 #include "util/thread_affinity.h"
 

src/library/coverartdelegate.cpp

@@ -8,7 +8,6 @@
 #include "library/trackmodel.h"
 #include "moc_coverartdelegate.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/logger.h"
 
 namespace {
@@ -126,8 +125,7 @@ void CoverArtDelegate::paintItem(
         VERIFY_OR_DEBUG_ASSERT(m_pCache) {
             return;
         }
-        const double scaleFactor =
-                getDevicePixelRatioF(qobject_cast<QWidget*>(parent()));
+        const double scaleFactor = qobject_cast<QWidget*>(parent())->devicePixelRatioF();
         QPixmap pixmap = m_pCache->tryLoadCover(this,
                 coverInfo,
                 static_cast<int>(option.rect.width() * scaleFactor),

src/library/coverartutils.cpp

@@ -7,7 +7,6 @@
 
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/logger.h"
 #include "util/regex.h"
 

src/library/dao/playlistdao.cpp

@@ -10,7 +10,6 @@
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/db/fwdsqlquery.h"
 #include "util/math.h"
 

src/library/dao/trackdao.cpp

@@ -30,7 +30,6 @@
 #include "track/track.h"
 #include "track/tracknumbers.h"
 #include "util/assert.h"
-#include "util/compatibility.h"
 #include "util/datetime.h"
 #include "util/db/fwdsqlquery.h"
 #include "util/db/sqlite.h"

src/library/dlgcoverartfullsize.cpp

@@ -9,7 +9,6 @@
 #include "library/coverartutils.h"
 #include "moc_dlgcoverartfullsize.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/widgethelper.h"
 
 DlgCoverArtFullSize::DlgCoverArtFullSize(QWidget* parent, BaseTrackPlayer* pPlayer)
@@ -187,10 +186,10 @@ void DlgCoverArtFullSize::slotCoverFound(
     } else if (dialogSize.width() > screenGeometry.width()) {
         dialogSize.scale(screenGeometry.width(), dialogSize.height(), Qt::KeepAspectRatio);
     }
-    QPixmap resizedPixmap = m_pixmap.scaled(size() * getDevicePixelRatioF(this),
+    QPixmap resizedPixmap = m_pixmap.scaled(size() * devicePixelRatioF(),
             Qt::KeepAspectRatio,
             Qt::SmoothTransformation);
-    resizedPixmap.setDevicePixelRatio(getDevicePixelRatioF(this));
+    resizedPixmap.setDevicePixelRatio(devicePixelRatioF());
     coverArt->setPixmap(resizedPixmap);
 
     // center the window
@@ -265,9 +264,10 @@ void DlgCoverArtFullSize::resizeEvent(QResizeEvent* event) {
         return;
     }
     // qDebug() << "DlgCoverArtFullSize::resizeEvent" << size();
-    QPixmap resizedPixmap = m_pixmap.scaled(size() * getDevicePixelRatioF(this),
-        Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    resizedPixmap.setDevicePixelRatio(getDevicePixelRatioF(this));
+    QPixmap resizedPixmap = m_pixmap.scaled(size() * devicePixelRatioF(),
+            Qt::KeepAspectRatio,
+            Qt::SmoothTransformation);
+    resizedPixmap.setDevicePixelRatio(devicePixelRatioF());
     coverArt->setPixmap(resizedPixmap);
 }
 

src/library/dlgtrackinfo.cpp

@@ -19,7 +19,6 @@
 #include "track/keyutils.h"
 #include "track/track.h"
 #include "util/color/colorpalette.h"
-#include "util/compatibility.h"
 #include "util/datetime.h"
 #include "util/desktophelper.h"
 #include "util/duration.h"

src/library/searchqueryparser.cpp

@@ -1,7 +1,5 @@
 #include "library/searchqueryparser.h"
 
-#include "util/compatibility.h"
-
 #include "track/keyutils.h"
 
 constexpr char kNegatePrefix[] = "-";

src/library/trackset/setlogfeature.cpp

@@ -15,7 +15,6 @@
 #include "mixer/playermanager.h"
 #include "moc_setlogfeature.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "widget/wtracktableview.h"

src/preferences/dialog/dlgprefcolors.cpp

@@ -11,7 +11,6 @@
 #include "library/trackcollection.h"
 #include "moc_dlgprefcolors.cpp"
 #include "util/color/predefinedcolorpalettes.h"
-#include "util/compatibility.h"
 #include "util/math.h"
 #include "util/memory.h"
 

src/preferences/dialog/dlgprefdeck.cpp

@@ -18,7 +18,6 @@
 #include "mixxxmainwindow.h"
 #include "moc_dlgprefdeck.cpp"
 #include "preferences/usersettings.h"
-#include "util/compatibility.h"
 #include "util/duration.h"
 #include "widget/wnumberpos.h"
 

src/preferences/dialog/dlgprefinterface.cpp

@@ -17,7 +17,6 @@
 #include "skin/legacy/legacyskinparser.h"
 #include "skin/skin.h"
 #include "skin/skinloader.h"
-#include "util/compatibility.h"
 #include "util/screensaver.h"
 #include "util/screensavermanager.h"
 #include "util/widgethelper.h"
@@ -56,7 +55,7 @@ DlgPrefInterface::DlgPrefInterface(
     setupUi(this);
 
     // get the pixel ratio to display a crisp skin preview when Mixxx is scaled
-    m_dDevicePixelRatio = getDevicePixelRatioF(this);
+    m_dDevicePixelRatio = devicePixelRatioF();
 
     // Calculate the minimum scale factor that leads to a device pixel ratio of 1.0
     // m_dDevicePixelRatio must not drop below 1.0 because this creates an

src/preferences/dialog/dlgprefkey.cpp

@@ -7,7 +7,6 @@
 #include "control/controlproxy.h"
 #include "library/library_prefs.h"
 #include "moc_dlgprefkey.cpp"
-#include "util/compatibility.h"
 #include "util/xml.h"
 
 DlgPrefKey::DlgPrefKey(QWidget* parent, UserSettingsPointer pConfig)

src/preferences/dialog/dlgprefsounditem.cpp

@@ -5,7 +5,6 @@
 #include "moc_dlgprefsounditem.cpp"
 #include "soundio/sounddevice.h"
 #include "soundio/soundmanagerconfig.h"
-#include "util/compatibility.h"
 
 /**
  * Constructs a new preferences sound item, representing an AudioPath and SoundDevice

src/vinylcontrol/vinylcontrolmanager.cpp

@@ -7,7 +7,6 @@
 #include "mixer/playermanager.h"
 #include "moc_vinylcontrolmanager.cpp"
 #include "soundio/soundmanager.h"
-#include "util/compatibility.h"
 #include "util/timer.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 #include "vinylcontrol/vinylcontrol.h"

src/waveform/widgets/waveformwidgetabstract.cpp

@@ -3,7 +3,6 @@
 #include <QWidget>
 #include <QtDebug>
 
-#include "util/compatibility.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 
 WaveformWidgetAbstract::WaveformWidgetAbstract(const QString& group)
@@ -43,7 +42,7 @@ void WaveformWidgetAbstract::resize(int width, int height) {
     qreal devicePixelRatio = 1.0;
     if (m_widget) {
         m_widget->resize(width, height);
-        devicePixelRatio = getDevicePixelRatioF(m_widget);
+        devicePixelRatio = m_widget->devicePixelRatioF();
     }
     WaveformWidgetRenderer::resize(width, height, static_cast<float>(devicePixelRatio));
 }

src/widget/wcoverart.cpp

@@ -14,7 +14,6 @@
 #include "library/dlgcoverartfullsize.h"
 #include "moc_wcoverart.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "util/dnd.h"
 #include "util/math.h"
 #include "widget/wskincolor.h"
@@ -199,9 +198,10 @@ QPixmap WCoverArt::scaledCoverArt(const QPixmap& normal) {
         return QPixmap();
     }
     QPixmap scaled;
-    scaled = normal.scaled(size() * getDevicePixelRatioF(this),
-            Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    scaled.setDevicePixelRatio(getDevicePixelRatioF(this));
+    scaled = normal.scaled(size() * devicePixelRatioF(),
+            Qt::KeepAspectRatio,
+            Qt::SmoothTransformation);
+    scaled.setDevicePixelRatio(devicePixelRatioF());
     return scaled;
 }
 

src/widget/wcoverartlabel.cpp

@@ -6,7 +6,6 @@
 #include "library/dlgcoverartfullsize.h"
 #include "moc_wcoverartlabel.cpp"
 #include "track/track.h"
-#include "util/compatibility.h"
 #include "widget/wcoverartmenu.h"
 
 namespace {
@@ -16,7 +15,7 @@ constexpr QSize kDeviceIndependentCoverLabelSize = QSize(100, 100);
 inline QPixmap scaleCoverLabel(
         QWidget* parent,
         QPixmap pixmap) {
-    const auto devicePixelRatioF = getDevicePixelRatioF(parent);
+    const auto devicePixelRatioF = parent->devicePixelRatioF();
     pixmap.setDevicePixelRatio(devicePixelRatioF);
     return pixmap.scaled(
             kDeviceIndependentCoverLabelSize * devicePixelRatioF,
@@ -62,9 +61,9 @@ void WCoverArtLabel::setCoverArt(const CoverInfo& coverInfo,
     }
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    QSize frameSize = pixmap(Qt::ReturnByValue).size() / getDevicePixelRatioF(this);
+    QSize frameSize = pixmap(Qt::ReturnByValue).size() / devicePixelRatioF();
 #else
-    QSize frameSize = pixmap()->size() / getDevicePixelRatioF(this);
+    QSize frameSize = pixmap()->size() / devicePixelRatioF();
 #endif
     frameSize += QSize(2,2); // margin
     setMinimumSize(frameSize);