Changeset 63054 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

Timestamp:

Aug 5, 2016 3:37:38 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 12): Moving desktop related stuff to desktop-widget watchdog rails; removing similar stuff from VBoxGlobal.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (4 diffs)

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

@@ -31 +31 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
+# include "UIDesktopWidgetWatchdog.h"
 # include "UIExtraDataManager.h"
 # include "UISession.h"
@@ -841 +842 @@
 
     /* Check if display count changed: */
-    if (vboxGlobal().screenCount() != m_hostScreens.size())
+    if (gpDesktop->screenCount() != m_hostScreens.size())
     {
         /* Reset watchdog: */
@@ -851 +852 @@
     {
         /* Check if at least one display geometry changed: */
-        for (int iScreenIndex = 0; iScreenIndex < vboxGlobal().screenCount(); ++iScreenIndex)
-        {
-            if (vboxGlobal().screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
+        for (int iScreenIndex = 0; iScreenIndex < gpDesktop->screenCount(); ++iScreenIndex)
+        {
+            if (gpDesktop->screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
             {
                 /* Reset watchdog: */
@@ -2197 +2198 @@
 {
     m_hostScreens.clear();
-    for (int iScreenIndex = 0; iScreenIndex < vboxGlobal().screenCount(); ++iScreenIndex)
-        m_hostScreens << vboxGlobal().screenGeometry(iScreenIndex);
+    for (int iScreenIndex = 0; iScreenIndex < gpDesktop->screenCount(); ++iScreenIndex)
+        m_hostScreens << gpDesktop->screenGeometry(iScreenIndex);
 }