Changeset 62989 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2016 1:50:58 PM (9 years ago)

Author:

vboxsync

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

109598

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 04): Renaming.

Location:

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

Files:

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

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

@@ -140 +140 @@
 }
 
-void UIDesktopWidgetWatchdog::sltUpdateHostScreenConfiguration(int cHostScreenCount /* = -1 */)
-{
-//    printf("UIDesktopWidgetWatchdog::sltUpdateHostScreenConfiguration(%d)\n", cHostScreenCount);
+void UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(int cHostScreenCount)
+{
+//    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(%d)\n", cHostScreenCount);
 
     /* Update host-screen configuration: */
@@ -148 +148 @@
 }
 
-void UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(int iHostScreenIndex)
-{
-//    printf("UIDesktopWidgetWatchdog::sltRecalculateHostScreenAvailableGeometry(%d)\n", iHostScreenIndex);
-
-    /* Recalculate host-screen available-geometry: */
-    recalculateHostScreenAvailableGeometry(iHostScreenIndex);
+void UIDesktopWidgetWatchdog::sltHandleHostScreenResized(int iHostScreenIndex)
+{
+//    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenResized(%d)\n", iHostScreenIndex);
+
+    /* Update host-screen available-geometry: */
+    updateHostScreenAvailableGeometry(iHostScreenIndex);
 }
 
@@ -173 +173 @@
 {
     /* Prepare connections: */
-    connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
-    connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
+    connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+    connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 
     /* Update host-screen configuration: */
@@ -183 +183 @@
 {
     /* Cleanup connections: */
-    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
-    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
+    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 
     /* Cleanup existing workers finally: */
@@ -202 +202 @@
     m_availableGeometryData.resize(m_cHostScreenCount);
 
-    /* Calculate host-screen available-geometry for each particular host-screen: */
+    /* Update host-screen available-geometry for each particular host-screen: */
     for (int iHostScreenIndex = 0; iHostScreenIndex < m_cHostScreenCount; ++iHostScreenIndex)
-        recalculateHostScreenAvailableGeometry(iHostScreenIndex);
-}
-
-void UIDesktopWidgetWatchdog::recalculateHostScreenAvailableGeometry(int iHostScreenIndex)
+        updateHostScreenAvailableGeometry(iHostScreenIndex);
+}
+
+void UIDesktopWidgetWatchdog::updateHostScreenAvailableGeometry(int iHostScreenIndex)
 {
     /* Make sure index is valid: */

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

@@ -50 +50 @@
 private slots:
 
-    /** Updates host-screen configuration according to new @a cHostScreenCount. */
-    void sltUpdateHostScreenConfiguration(int cHostScreenCount);
+    /** Handles host-screen count change to @a cHostScreenCount. */
+    void sltHandleHostScreenCountChanged(int cHostScreenCount);
 
-    /** Recalculates available-geometry for the host-screen with @a iHostScreenIndex. */
-    void sltRecalculateHostScreenAvailableGeometry(int iHostScreenIndex);
+    /** Handles resize for the host-screen with @a iHostScreenIndex. */
+    void sltHandleHostScreenResized(int iHostScreenIndex);
 
     /** Handles @a availableGeometry calculation result for the host-screen with @a iHostScreenIndex. */
@@ -67 +67 @@
 
     /** Updates host-screen configuration according to new @a cHostScreenCount.
-      * @note cHostScreenCount can be equal to -1 which means we have to acquire it ourselves. */
+      * @note If cHostScreenCount is equal to -1 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);
+    /** Update available-geometry for the host-screen with @a iHostScreenIndex. */
+    void updateHostScreenAvailableGeometry(int iHostScreenIndex);
 
     /** Cleanups existing workers. */