Changeset 63175 in vbox for trunk/src/VBox

Timestamp:

Aug 8, 2016 2:53:39 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109793

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 14): Continue moving desktop related stuff to desktop-widget watchdog rails (s.a. r109666).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDesktopWidgetWatchdog.cpp (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (5 diffs)
• precomp.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)
• widgets/UIMiniToolBar.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -166 +166 @@
 int UIDesktopWidgetWatchdog::screenNumber(const QWidget *pWidget) const
 {
-    /* Redirect call to QDesktopWidget: */
+    /* Redirect call to desktop-widget: */
     return QApplication::desktop()->screenNumber(pWidget);
 }
@@ -172 +172 @@
 int UIDesktopWidgetWatchdog::screenNumber(const QPoint &point) const
 {
-    /* Redirect call to QDesktopWidget: */
+    /* Redirect call to desktop-widget: */
     return QApplication::desktop()->screenNumber(point);
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -24 +24 @@
 # include <QToolTip>
 # include <QTranslator>
-# include <QDesktopWidget>
 # if QT_VERSION >= 0x050000
 #  include <QStandardPaths>
@@ -2600 +2599 @@
     {
         w = w->window();
-        deskGeo = QApplication::desktop()->availableGeometry (w);
+        deskGeo = gpDesktop->availableGeometry (w);
         parentGeo = w->frameGeometry();
         /* On X11/Gnome, geo/frameGeo.x() and y() are always 0 for top level
@@ -2611 +2610 @@
     else
     {
-        deskGeo = QApplication::desktop()->availableGeometry();
+        deskGeo = gpDesktop->availableGeometry();
         parentGeo = deskGeo;
     }
@@ -2879 +2878 @@
 quint64 VBoxGlobal::requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors /* = 1 */)
 {
-    QDesktopWidget *pDW = QApplication::desktop();
     /* We create a list of the size of all available host monitors. This list
      * is sorted by value and by starting with the biggest one, we calculate
@@ -2886 +2884 @@
      * open the guest windows, this is the best assumption we can do, cause it
      * is the worst case. */
-    const int cHostScreens = pDW->screenCount();
+    const int cHostScreens = gpDesktop->screenCount();
     QVector<int> screenSize(qMax(cMonitors, cHostScreens), 0);
     for (int i = 0; i < cHostScreens; ++i)
     {
-        QRect r = pDW->screenGeometry(i);
+        QRect r = gpDesktop->screenGeometry(i);
         screenSize[i] = r.width() * r.height();
     }

trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

@@ -54 +54 @@
 #include <QDateTime>
 #include <QDesktopServices>
-#include <QDesktopWidget>
+//#include <QDesktopWidget> -  only used once
 #include <QDialog>
 #include <QDialogButtonBox>

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QDesktopWidget>
 # include <QMainWindow>
 # include <QPainter>
@@ -804 +803 @@
 {
     /* Desktop resolution change (e.g. monitor hotplug): */
-    connect(QApplication::desktop(), SIGNAL(resized(int)), this,
+    connect(gpDesktop, SIGNAL(sigHostScreenResized(int)), this,
             SLOT(sltDesktopResized()));
     /* Scale-factor change: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QDesktopWidget>
 # include <QMouseEvent>
 # include <QTimer>
@@ -882 +881 @@
             m_lastMousePos = globalPos;
 #else /* VBOX_WS_WIN */
-        int iWe = QApplication::desktop()->width() - 1;
-        int iHe = QApplication::desktop()->height() - 1;
+        int iWe = gpDesktop->overallDesktopWidth() - 1;
+        int iHe = gpDesktop->overallDesktopHeight() - 1;
         QPoint p = globalPos;
         if (globalPos.x() == 0)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -23 +23 @@
 # include <QApplication>
 # include <QBitmap>
-# include <QDesktopWidget>
 # include <QWidget>
 # ifdef VBOX_WS_MAC
@@ -1126 +1125 @@
 #else /* !VBOX_WS_MAC */
     /* Install Qt display reconfiguration callbacks: */
-    connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)),
+    connect(gpDesktop, SIGNAL(sigHostScreenCountChanged(int)),
             this, SLOT(sltHandleHostScreenCountChange()));
-    connect(QApplication::desktop(), SIGNAL(resized(int)),
+    connect(gpDesktop, SIGNAL(sigHostScreenResized(int)),
             this, SLOT(sltHandleHostScreenGeometryChange()));
-    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
+    connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaResized(int)),
             this, SLOT(sltHandleHostScreenAvailableAreaChange()));
 #endif /* !VBOX_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -29 +29 @@
 # if QT_VERSION >= 0x050000
 #  include <QStandardPaths>
-#  ifdef VBOX_WS_X11
-#   include <QDesktopWidget>
-#  endif /* VBOX_WS_X11 */
 # else /* QT_VERSION < 0x050000 */
 #  include <QDesktopServices>
@@ -1726 +1723 @@
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
     /* Desktop event handlers: */
-    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenAvailableAreaChange()));
+    connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaResized(int)), this, SLOT(sltHandleHostScreenAvailableAreaChange()));
 #endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -30 +30 @@
 # include <QStateMachine>
 # include <QPainter>
-# include <QDesktopWidget>
 # ifdef VBOX_WS_WIN
 #  include <QWindow>
@@ -637 +636 @@
 
     /* Get corresponding host-screen: */
-    const int iHostScreen = QApplication::desktop()->screenNumber(parentWidget());
+    const int iHostScreen = gpDesktop->screenNumber(parentWidget());
     Q_UNUSED(iHostScreen);
     /* And corresponding working area: */