Changeset 63044 in vbox for trunk/src

Timestamp:

Aug 5, 2016 1:27:06 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 11): Converting to singleton; using everywhere, not just under X11.

Location:

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

Files:

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

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

@@ -107 +107 @@
 *********************************************************************************************************************************/
 
-UIDesktopWidgetWatchdog::UIDesktopWidgetWatchdog(QObject *pParent)
-    : QObject(pParent)
-{
-    /* Prepare: */
-    prepare();
+/* static */
+UIDesktopWidgetWatchdog *UIDesktopWidgetWatchdog::m_spInstance = 0;
+
+/* static */
+void UIDesktopWidgetWatchdog::create()
+{
+    /* Make sure instance isn't created: */
+    AssertReturnVoid(!m_spInstance);
+
+    /* Create/prepare instance: */
+    new UIDesktopWidgetWatchdog;
+    AssertReturnVoid(m_spInstance);
+    m_spInstance->prepare();
+}
+
+/* static */
+void UIDesktopWidgetWatchdog::destroy()
+{
+    /* Make sure instance is created: */
+    AssertReturnVoid(m_spInstance);
+
+    /* Cleanup/destroy instance: */
+    m_spInstance->cleanup();
+    delete m_spInstance;
+    AssertReturnVoid(!m_spInstance);
+}
+
+UIDesktopWidgetWatchdog::UIDesktopWidgetWatchdog()
+{
+    /* Initialize instance: */
+    m_spInstance = this;
 }
 
 UIDesktopWidgetWatchdog::~UIDesktopWidgetWatchdog()
 {
-    /* Cleanup: */
-    cleanup();
+    /* Deinitialize instance: */
+    m_spInstance = 0;
 }
 

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

@@ -31 +31 @@
 #endif /* QT_VERSION >= 0x050000 */
 
-/** QObject extension used as
+/** Singleton QObject extension used as
   * a desktop-widget watchdog aware
   * of the host-screen geometry changes. */
@@ -37 +37 @@
 {
     Q_OBJECT;
+
+    /** Constructs desktop-widget watchdog. */
+    UIDesktopWidgetWatchdog();
+    /** Destructs desktop-widget watchdog. */
+    ~UIDesktopWidgetWatchdog();
 
 signals:
@@ -51 +56 @@
 public:
 
-    /** Constructs watchdog for the @a pParent being passed into the base-class. */
-    UIDesktopWidgetWatchdog(QObject *pParent);
-    /** Destructs watchdog. */
-    ~UIDesktopWidgetWatchdog();
+    /** Returns the static instance of the desktop-widget watchdog. */
+    static UIDesktopWidgetWatchdog *instance() { return m_spInstance; }
+
+    /** Creates the static instance of the desktop-widget watchdog. */
+    static void create();
+    /** Destroys the static instance of the desktop-widget watchdog. */
+    static void destroy();
 
     /** Returns the number of host-screens currently available on the system. */
@@ -112 +120 @@
     void cleanup();
 
+    /** Holds the static instance of the desktop-widget watchdog. */
+    static UIDesktopWidgetWatchdog *m_spInstance;
+
 #ifdef VBOX_WS_X11
     /** Updates host-screen configuration according to new @a cHostScreenCount.
@@ -130 +141 @@
 };
 
+/** 'Official' name for the desktop-widget watchdog singleton. */
+#define gpDesktop UIDesktopWidgetWatchdog::instance()
+
 #endif /* !___UIDesktopWidgetWatchdog_h___ */
 

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

@@ -77 +77 @@
 # include "UIIconPool.h"
 # include "UIVirtualBoxEventHandler.h"
+# include "UIDesktopWidgetWatchdog.h"
 # ifdef VBOX_WS_X11
 #  include "UIHostComboEditor.h"
-#  include "UIDesktopWidgetWatchdog.h"
 #  ifndef VBOX_OSE
 #   include "VBoxLicenseViewer.h"
@@ -237 +237 @@
     , m_fCompositingManagerRunning(false)
     , m_enmWindowManagerType(X11WMType_Unknown)
-    , m_pDesktopWidgetWatchdog(0)
 #endif /* VBOX_WS_X11 */
 #if defined(DEBUG_bird)
@@ -362 +361 @@
 #ifdef VBOX_WS_X11
     /* Make sure desktop-widget watchdog already created: */
-    AssertPtrReturn(m_pDesktopWidgetWatchdog, QApplication::desktop()->screenGeometry(iHostScreenIndex));
+    AssertPtrReturn(gpDesktop, QApplication::desktop()->screenGeometry(iHostScreenIndex));
     /* Redirect call to UIDesktopWidgetWatchdog: */
-    return m_pDesktopWidgetWatchdog->screenGeometry(iHostScreenIndex);
+    return gpDesktop->screenGeometry(iHostScreenIndex);
 #endif /* VBOX_WS_X11 */
 
@@ -375 +374 @@
 #ifdef VBOX_WS_X11
     /* Make sure desktop-widget watchdog already created: */
-    AssertPtrReturn(m_pDesktopWidgetWatchdog, QApplication::desktop()->availableGeometry(iHostScreenIndex));
+    AssertPtrReturn(gpDesktop, QApplication::desktop()->availableGeometry(iHostScreenIndex));
     /* Redirect call to UIDesktopWidgetWatchdog: */
-    return m_pDesktopWidgetWatchdog->availableGeometry(iHostScreenIndex);
+    return gpDesktop->availableGeometry(iHostScreenIndex);
 #endif /* VBOX_WS_X11 */
 
@@ -3989 +3988 @@
 #endif /* VBOX_WS_MAC */
 
-#ifdef VBOX_WS_X11
-    /* Create desktop-widget watchdog instance: */
-    m_pDesktopWidgetWatchdog = new UIDesktopWidgetWatchdog(this);
-#endif /* VBOX_WS_X11 */
+    /* Create desktop-widget watchdog: */
+    UIDesktopWidgetWatchdog::create();
 
     /* Create message-center: */
@@ -4491 +4488 @@
     UIMessageCenter::destroy();
 
+    /* Destroy desktop-widget watchdog: */
+    UIDesktopWidgetWatchdog::destroy();
+
     mValid = false;
 }

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

@@ -66 +66 @@
 class UIIconPoolGeneral;
 class UIThreadPool;
-#ifdef VBOX_WS_X11
-class UIDesktopWidgetWatchdog;
-#endif /* VBOX_WS_X11 */
 
 // VBoxGlobal class
@@ -578 +575 @@
     /** X11: Holds the type of the Window Manager we are running under. */
     X11WMType m_enmWindowManagerType;
-
-    /** @name Host-screen geometry stuff
-      * @{ */
-        /** X11: Holds the desktop-widget watchdog instance aware of host-screen geometry changes. */
-        UIDesktopWidgetWatchdog *m_pDesktopWidgetWatchdog;
-    /** @} */
 #endif /* VBOX_WS_X11 */