remove Qt5 compatibility for QWidget::screen()

Author: ronso0

src/errordialoghandler.cpp

@@ -4,14 +4,14 @@
 #include <QGuiApplication>
 #include <QScopedPointer>
 #include <QScreen>
+#include <QStyle>
 #include <QThread>
 #include <QtDebug>
 
 #include "moc_errordialoghandler.cpp"
 #include "util/assert.h"
 #include "util/compatibility/qmutex.h"
 #include "util/versionstore.h"
-#include "util/widgethelper.h"
 
 namespace {
 // Gross estimated dimensions for the size of the error dialog,
@@ -164,8 +164,7 @@ void ErrorDialogHandler::errorDialog(ErrorDialogProperties* pProps) {
         if (props->m_detailsUseMonospaceFont) {
             // There is no event to respond on the Show Details button of QMessagBox.
             // Therefore we must consider the expanded size for positioning the dialog initially.
-            auto* pScreen =
-                    mixxx::widgethelper::getScreen(*pMsgBox);
+            auto* pScreen = pMsgBox->screen();
             if (!pScreen) {
                 // Fallback to obtain the primary screen when mixxx::widgethelper::getScreen can't
                 // determine the screen. This happens always with Qt <5.14

src/library/dlgcoverartfullsize.cpp

@@ -10,7 +10,6 @@
 #include "mixer/basetrackplayer.h"
 #include "moc_dlgcoverartfullsize.cpp"
 #include "track/track.h"
-#include "util/widgethelper.h"
 #include "widget/wcoverartmenu.h"
 
 DlgCoverArtFullSize::DlgCoverArtFullSize(
@@ -191,7 +190,7 @@ void DlgCoverArtFullSize::adjustImageAndDialogSize() {
         centerOverWidget = this;
     }
 
-    const QScreen* const pScreen = mixxx::widgethelper::getScreen(*centerOverWidget);
+    const auto* const pScreen = centerOverWidget->screen();
     QRect screenGeometry;
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         qWarning() << "Assuming screen size of 800x600px.";

src/preferences/dialog/dlgpreferences.cpp

@@ -16,7 +16,6 @@
 #include "preferences/dialog/dlgprefsound.h"
 #include "util/color/color.h"
 #include "util/desktophelper.h"
-#include "util/widgethelper.h"
 
 #ifdef __VINYLCONTROL__
 #include "preferences/dialog/dlgprefvinyl.h"
@@ -352,7 +351,7 @@ void DlgPreferences::onShow() {
     int newWidth = m_geometry[2].toInt();
     int newHeight = m_geometry[3].toInt();
 
-    const QScreen* const pScreen = mixxx::widgethelper::getScreen(*this);
+    const auto* const pScreen = screen();
     QRect screenAvailableGeometry;
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         qWarning() << "Assuming screen size of 800x600px.";
@@ -554,7 +553,7 @@ void DlgPreferences::resizeEvent(QResizeEvent* e) {
 
 QRect DlgPreferences::getDefaultGeometry() {
     adjustSize();
-    const auto* const pScreen = mixxx::widgethelper::getScreen(*this);
+    const auto* const pScreen = screen();
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         return QRect();
     }

src/preferences/dialog/dlgprefinterface.cpp

@@ -19,7 +19,6 @@
 #include "util/cmdlineargs.h"
 #include "util/screensaver.h"
 #include "util/screensavermanager.h"
-#include "util/widgethelper.h"
 
 using mixxx::skin::SkinManifest;
 using mixxx::skin::SkinPointer;
@@ -236,8 +235,7 @@ DlgPrefInterface::DlgPrefInterface(
 }
 
 QScreen* DlgPrefInterface::getScreen() const {
-    auto* pScreen =
-            mixxx::widgethelper::getScreen(*this);
+    auto* pScreen = screen();
     if (!pScreen) {
         // Obtain the primary screen. This is necessary if no window is
         // available before the widget is displayed.

src/util/widgethelper.cpp

@@ -13,7 +13,7 @@ QPoint mapPopupToScreen(
         const QWidget& widget,
         const QPoint& popupUpperLeft,
         const QSize& popupSize) {
-    const auto* const pScreen = getScreen(widget);
+    const auto* const pScreen = widget.screen();
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         // This should never fail
         return popupUpperLeft;
@@ -37,8 +37,7 @@ QPoint mapPopupToScreen(
     return QPoint(adjustedX, adjustedY);
 }
 
-QWindow* getWindow(
-        const QWidget& widget) {
+QWindow* getWindow(const QWidget& widget) {
     if (auto* window = widget.windowHandle()) {
         return window;
     }
@@ -52,7 +51,7 @@ void growListWidget(QListWidget& listWidget, const QWidget& parent) {
     // Try to display all files and the complete file locations to avoid
     // horizontal scrolling.
     // Get the screen dimensions
-    QScreen* const pScreen = getScreen(parent);
+    const auto* const pScreen = parent.screen();
     QSize screenSpace;
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         qWarning() << "Screen not detected. Assuming screen size of 800x600px.";
@@ -67,7 +66,7 @@ void growListWidget(QListWidget& listWidget, const QWidget& parent) {
     int minW = listWidget.sizeHintForColumn(0) + margin;
     int minH = listWidget.sizeHintForRow(0) * listWidget.count() + margin;
     // The file list should fit into the window, but clamp to 75% of screen size
-    // so (hoepfully) the entire containing dialog is visible even if there are
+    // so (hopefully) the entire containing dialog is visible even if there are
     // toolbars at the screen edges
     int newW = std::min(minW, static_cast<int>(screenSpace.width() * 0.75));
     int newH = std::min(minH, static_cast<int>(screenSpace.height() * 0.75));

src/util/widgethelper.h

@@ -28,28 +28,6 @@ QPoint mapPopupToScreen(
 QWindow* getWindow(
         const QWidget& widget);
 
-/// Obtains the corresponding screen for the given widget.
-///
-/// Might return nullptr if no screen could be determined.
-inline QScreen* getScreen(
-        const QWidget& widget) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    return widget.screen();
-#else
-    const auto* pWindow = getWindow(widget);
-    if (!pWindow && widget.parent()) {
-        // The window might still be hidden and invisible. Then we
-        // try to obtain the screen from its parent recursively.
-        return getScreen(*qobject_cast<QWidget*>(widget.parent()));
-    }
-    if (!pWindow) {
-        // This might happen if the widget is not yet displayed
-        return nullptr;
-    }
-    return pWindow->screen();
-#endif
-}
-
 /// QSize for stretching a list widget attempting to show entire column
 void growListWidget(QListWidget& listWidget, const QWidget& parent);
 

src/widget/wsearchrelatedtracksmenu.cpp

@@ -14,7 +14,6 @@
 #include "util/math.h"
 #include "util/parented_ptr.h"
 #include "util/qt.h"
-#include "util/widgethelper.h"
 
 namespace {
 
@@ -110,8 +109,7 @@ QString WSearchRelatedTracksMenu::elideActionText(
     if (elidableTextSuffix.isEmpty()) {
         return actionTextPrefix;
     }
-    const auto* const pScreen =
-            mixxx::widgethelper::getScreen(*this);
+    const auto* const pScreen = screen();
     VERIFY_OR_DEBUG_ASSERT(pScreen) {
         // This should never fail
         return actionTextPrefix;