Changeset 62999 in vbox

Timestamp:

Aug 4, 2016 3:32:26 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 07): Do not cache desktop-widget itself.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (6 diffs)
• UIDesktopWidgetWatchdog.h (modified) (1 diff)

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

@@ -108 +108 @@
 UIDesktopWidgetWatchdog::UIDesktopWidgetWatchdog(QObject *pParent)
     : QObject(pParent)
-    , m_pDesktopWidget(QApplication::desktop())
 {
     /* Prepare: */
@@ -130 +129 @@
     /* Make sure index is valid: */
     if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
-        iHostScreenIndex = m_pDesktopWidget->primaryScreen();
+        iHostScreenIndex = QApplication::desktop()->primaryScreen();
     AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount(), QRect());
 
     /* Redirect call to desktop-widget: */
-    return m_pDesktopWidget->screenGeometry(iHostScreenIndex);
+    return QApplication::desktop()->screenGeometry(iHostScreenIndex);
 }
 
@@ -141 +140 @@
     /* Make sure index is valid: */
     if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
-        iHostScreenIndex = m_pDesktopWidget->primaryScreen();
+        iHostScreenIndex = QApplication::desktop()->primaryScreen();
     AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount(), QRect());
 
@@ -204 +203 @@
     /* Prepare connections: */
 #if QT_VERSION < 0x050000
-    connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+    connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
 #else /* QT_VERSION >= 0x050000 */
     connect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *)));
     connect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *)));
 #endif /* QT_VERSION >= 0x050000 */
-    connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
+    connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 
     /* Update host-screen configuration: */
@@ -219 +218 @@
     /* Cleanup connections: */
 #if QT_VERSION < 0x050000
-    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+    disconnect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
 #else /* QT_VERSION >= 0x050000 */
     disconnect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *)));
     disconnect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *)));
 #endif /* QT_VERSION >= 0x050000 */
-    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
+    disconnect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 
     /* Cleanup existing workers finally: */
@@ -252 +251 @@
     /* Make sure index is valid: */
     if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
-        iHostScreenIndex = m_pDesktopWidget->primaryScreen();
+        iHostScreenIndex = QApplication::desktop()->primaryScreen();
     AssertReturnVoid(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount());
 

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

@@ -89 +89 @@
     void cleanupExistingWorkers();
 
-    /** Holds the desktop-widget reference pointer. */
-    QDesktopWidget *m_pDesktopWidget;
-
     /** Holds current host-screen available-geometries. */
     QVector<QRect> m_availableGeometryData;