Changeset 62988 in vbox

Timestamp:

Aug 4, 2016 1:48:34 PM (9 years ago)

Author:

vboxsync

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

109597

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 03): Another refactoring.

Location:

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

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (3 diffs)
• UIDesktopWidgetWatchdog.h (modified) (2 diffs)

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

@@ -144 +144 @@
 //    printf("UIDesktopWidgetWatchdog::sltUpdateHostScreenConfiguration(%d)\n", cHostScreenCount);
 
+    /* Update host-screen configuration: */
+    updateHostScreenConfiguration(cHostScreenCount);
+}
+
+void UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(int iHostScreenIndex)
+{
+//    printf("UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(%d)\n", iHostScreenIndex);
+
+    /* Recalculate host-screen available-geometry: */
+    recalculateHostScreenAvailableGeometry(iHostScreenIndex);
+}
+
+void UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated(int iHostScreenIndex, QRect availableGeometry)
+{
+//    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated(%d): %dx%d x %dx%d\n",
+//           iHostScreenIndex, availableGeometry.x(), availableGeometry.y(), availableGeometry.width(), availableGeometry.height());
+
+    /* Apply received data: */
+    m_availableGeometryData[iHostScreenIndex] = availableGeometry;
+    /* Forget finished worker: */
+    AssertPtrReturnVoid(m_availableGeometryWorkers.value(iHostScreenIndex));
+    m_availableGeometryWorkers.value(iHostScreenIndex)->disconnect();
+    m_availableGeometryWorkers.value(iHostScreenIndex)->deleteLater();
+    m_availableGeometryWorkers[iHostScreenIndex] = 0;
+}
+
+void UIDesktopWidgetWatchdog::prepare()
+{
+    /* Prepare connections: */
+    connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
+    connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
+
+    /* Update host-screen configuration: */
+    updateHostScreenConfiguration();
+}
+
+void UIDesktopWidgetWatchdog::cleanup()
+{
+    /* Cleanup connections: */
+    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
+    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
+
+    /* Cleanup existing workers finally: */
+    cleanupExistingWorkers();
+}
+
+void UIDesktopWidgetWatchdog::updateHostScreenConfiguration(int cHostScreenCount /* = -1 */)
+{
     /* Acquire new host-screen count: */
     m_cHostScreenCount = cHostScreenCount != -1 ? cHostScreenCount : m_pDesktopWidget->screenCount();
@@ -156 +204 @@
     /* Calculate host-screen available-geometry for each particular host-screen: */
     for (int iHostScreenIndex = 0; iHostScreenIndex < m_cHostScreenCount; ++iHostScreenIndex)
-        sltRecalculateHostScreenAvailableGeometry(iHostScreenIndex);
-}
-
-void UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(int iHostScreenIndex)
-{
-//    printf("UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(%d)\n", iHostScreenIndex);
-
+        recalculateHostScreenAvailableGeometry(iHostScreenIndex);
+}
+
+void UIDesktopWidgetWatchdog::recalculateHostScreenAvailableGeometry(int iHostScreenIndex)
+{
     /* Make sure index is valid: */
     if (iHostScreenIndex < 0 || iHostScreenIndex >= m_cHostScreenCount)
@@ -193 +239 @@
 }
 
-void UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated(int iHostScreenIndex, QRect availableGeometry)
-{
-//    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated(%d): %dx%d x %dx%d\n",
-//           iHostScreenIndex, availableGeometry.x(), availableGeometry.y(), availableGeometry.width(), availableGeometry.height());
-
-    /* Apply received data: */
-    m_availableGeometryData[iHostScreenIndex] = availableGeometry;
-    /* Forget finished worker: */
-    AssertPtrReturnVoid(m_availableGeometryWorkers.value(iHostScreenIndex));
-    m_availableGeometryWorkers.value(iHostScreenIndex)->disconnect();
-    m_availableGeometryWorkers.value(iHostScreenIndex)->deleteLater();
-    m_availableGeometryWorkers[iHostScreenIndex] = 0;
-}
-
-void UIDesktopWidgetWatchdog::prepare()
-{
-    /* Prepare connections: */
-    connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
-    connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
-
-    /* Update host-screen configuration: */
-    sltUpdateHostScreenConfiguration();
-}
-
-void UIDesktopWidgetWatchdog::cleanup()
-{
-    /* Cleanup connections: */
-    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
-    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
-
-    /* Cleanup existing workers finally: */
-    cleanupExistingWorkers();
-}
-
 void UIDesktopWidgetWatchdog::cleanupExistingWorkers()
 {

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

@@ -50 +50 @@
 private slots:
 
-    /** Updates host-screen configuration according to new @a cHostScreenCount.
-      * @note cHostScreenCount can be equal to -1 which means we have to acquire it ourselves. */
-    void sltUpdateHostScreenConfiguration(int cHostScreenCount = -1);
+    /** Updates host-screen configuration according to new @a cHostScreenCount. */
+    void sltUpdateHostScreenConfiguration(int cHostScreenCount);
 
     /** Recalculates available-geometry for the host-screen with @a iHostScreenIndex. */
@@ -66 +65 @@
     /** Cleanup routine. */
     void cleanup();
+
+    /** Updates host-screen configuration according to new @a cHostScreenCount.
+      * @note cHostScreenCount can be equal to -1 which means we have to acquire it ourselves. */
+    void updateHostScreenConfiguration(int cHostScreenCount = -1);
+
+    /** Recalculates available-geometry for the host-screen with @a iHostScreenIndex. */
+    void recalculateHostScreenAvailableGeometry(int iHostScreenIndex);
 
     /** Cleanups existing workers. */