Reduce QDesktopWidget API to bare minimum

The class is documented as obsolete, and the majority of APIs is marked
as deprecated. In this first phase, remove all explicitly deprecated
APIs and trivial implementations.

The test case is complete removed; what's left when code that uses any
of those deprecated methods is removed is not testing anything
meaningful.

For some methods, there is no practical replacement using QScreen yet,
and QDesktopWidget is still used in QWidget internals. Those require
refactoring to only use QScreen before the rest can be removed.

Change-Id: I8f7c968ec566820077221d37b817843758d51d49
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

5 files changed, 10 insertions, 10 deletions

diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index 693692d6c7..3d2396c4a6 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -3021,7 +3021,7 @@ QSize QDockAreaLayout::minimumSize() const
 QRect QDockAreaLayout::constrainedRect(QRect rect, QWidget* widget)
 {
     QRect desktop;
-    if (QDesktopWidgetPrivate::isVirtualDesktop())
+    if (QGuiApplication::primaryScreen()->virtualSiblings().size() > 1)
         desktop = QDesktopWidgetPrivate::screenGeometry(rect.topLeft());
     else
         desktop = QDesktopWidgetPrivate::screenGeometry(widget);
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 713c5f3d75..e6fd021e4a 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -1744,7 +1744,7 @@ QSize QMdiArea::sizeHint() const
     }
     const int scaleFactor = 3 * (nestedCount + 1);
 
-    QSize desktopSize = QDesktopWidgetPrivate::size();
+    QSize desktopSize = QGuiApplication::primaryScreen()->virtualSize();
     QSize size(desktopSize.width() * 2 / scaleFactor, desktopSize.height() * 2 / scaleFactor);
     for (QMdiSubWindow *child : d_func()->childWindows) {
         if (!sanityCheck(child, "QMdiArea::sizeHint"))
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 9122273d0d..b45a6b5b01 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1625,7 +1625,7 @@ QSize QMenuBar::minimumSizeHint() const
     int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, nullptr, this);
     int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, nullptr, this);
     if(as_gui_menubar) {
-        int w = parentWidget() ? parentWidget()->width() : QDesktopWidgetPrivate::width();
+        int w = parentWidget() ? parentWidget()->width() : QGuiApplication::primaryScreen()->virtualGeometry().width();
         d->calcActionRects(w - (2 * fw), 0);
         for (int i = 0; ret.isNull() && i < d->actions.count(); ++i)
             ret = d->actionRects.at(i).size();
@@ -1675,7 +1675,7 @@ QSize QMenuBar::sizeHint() const
     int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, nullptr, this);
     int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, nullptr, this);
     if(as_gui_menubar) {
-        const int w = parentWidget() ? parentWidget()->width() : QDesktopWidgetPrivate::width();
+        const int w = parentWidget() ? parentWidget()->width() : QGuiApplication::primaryScreen()->virtualGeometry().width();
         d->calcActionRects(w - (2 * fw), 0);
         for (int i = 0; i < d->actionRects.count(); ++i) {
             const QRect &actionRect = d->actionRects.at(i);
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 115a557e52..6f9e51cf4a 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -899,7 +899,7 @@ QSize QTabWidget::sizeHint() const
         if (usesScrollButtons())
             t = t.boundedTo(QSize(200,200));
         else
-            t = t.boundedTo(QDesktopWidgetPrivate::size());
+            t = t.boundedTo(QGuiApplication::primaryScreen()->virtualGeometry().size());
     }
 
     QSize sz = basicSize(d->pos == North || d->pos == South, lc, rc, s, t);
@@ -968,7 +968,7 @@ int QTabWidget::heightForWidth(int width) const
         if (usesScrollButtons())
             t = t.boundedTo(QSize(200,200));
         else
-            t = t.boundedTo(QDesktopWidgetPrivate::size());
+            t = t.boundedTo(QGuiApplication::primaryScreen()->virtualSize());
     }
 
     const bool tabIsHorizontal = (d->pos == North || d->pos == South);
diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp
index 43aa4c7988..e012ca624d 100644
--- a/src/widgets/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/widgets/qwidgetresizehandler.cpp
@@ -336,7 +336,7 @@ void QWidgetResizeHandler::keyPressEvent(QKeyEvent * e)
     switch (e->key()) {
     case Qt::Key_Left:
         pos.rx() -= delta;
-        if (pos.x() <= QDesktopWidgetPrivate::geometry().left()) {
+        if (pos.x() <= QGuiApplication::primaryScreen()->virtualGeometry().left()) {
             if (mode == TopLeft || mode == BottomLeft) {
                 moveOffset.rx() += delta;
                 invertedMoveOffset.rx() += delta;
@@ -361,7 +361,7 @@ void QWidgetResizeHandler::keyPressEvent(QKeyEvent * e)
         break;
     case Qt::Key_Right:
         pos.rx() += delta;
-        if (pos.x() >= QDesktopWidgetPrivate::geometry().right()) {
+        if (pos.x() >= QGuiApplication::primaryScreen()->virtualGeometry().right()) {
             if (mode == TopRight || mode == BottomRight) {
                 moveOffset.rx() += delta;
                 invertedMoveOffset.rx() += delta;
@@ -386,7 +386,7 @@ void QWidgetResizeHandler::keyPressEvent(QKeyEvent * e)
         break;
     case Qt::Key_Up:
         pos.ry() -= delta;
-        if (pos.y() <= QDesktopWidgetPrivate::geometry().top()) {
+        if (pos.y() <= QGuiApplication::primaryScreen()->virtualGeometry().top()) {
             if (mode == TopLeft || mode == TopRight) {
                 moveOffset.ry() += delta;
                 invertedMoveOffset.ry() += delta;
@@ -411,7 +411,7 @@ void QWidgetResizeHandler::keyPressEvent(QKeyEvent * e)
         break;
     case Qt::Key_Down:
         pos.ry() += delta;
-        if (pos.y() >= QDesktopWidgetPrivate::geometry().bottom()) {
+        if (pos.y() >= QGuiApplication::primaryScreen()->virtualGeometry().bottom()) {
             if (mode == BottomLeft || mode == BottomRight) {
                 moveOffset.ry() += delta;
                 invertedMoveOffset.ry() += delta;