Changeset 71429 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 21, 2018 1:16:51 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Tiny cleanup for UIDesktopWidgetWatchdog.

Location:

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

Files:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2015-2017 Oracle Corporation
+ * Copyright (C) 2015-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -224 +224 @@
 
 /* static */
-UIDesktopWidgetWatchdog *UIDesktopWidgetWatchdog::m_spInstance = 0;
+UIDesktopWidgetWatchdog *UIDesktopWidgetWatchdog::s_pInstance = 0;
 
 /* static */
@@ -230 +230 @@
 {
     /* Make sure instance isn't created: */
-    AssertReturnVoid(!m_spInstance);
+    AssertReturnVoid(!s_pInstance);
 
     /* Create/prepare instance: */
     new UIDesktopWidgetWatchdog;
-    AssertReturnVoid(m_spInstance);
-    m_spInstance->prepare();
+    AssertReturnVoid(s_pInstance);
+    s_pInstance->prepare();
 }
 
@@ -242 +242 @@
 {
     /* Make sure instance is created: */
-    AssertReturnVoid(m_spInstance);
+    AssertReturnVoid(s_pInstance);
 
     /* Cleanup/destroy instance: */
-    m_spInstance->cleanup();
-    delete m_spInstance;
-    AssertReturnVoid(!m_spInstance);
+    s_pInstance->cleanup();
+    delete s_pInstance;
+    AssertReturnVoid(!s_pInstance);
 }
 
@@ -253 +253 @@
 {
     /* Initialize instance: */
-    m_spInstance = this;
+    s_pInstance = this;
 }
 
@@ -259 +259 @@
 {
     /* Deinitialize instance: */
-    m_spInstance = 0;
+    s_pInstance = 0;
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2015-2017 Oracle Corporation
+ * Copyright (C) 2015-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 # include <QVector>
 # include <QRect>
-#endif /* VBOX_WS_X11 */
+#endif
 
 /* Forward declarations: */
 class QScreen;
 
-/** Singleton QObject extension used as
-  * a desktop-widget watchdog aware
-  * of the host-screen geometry changes. */
+/** Singleton QObject extension used as desktop-widget
+  * watchdog aware of the host-screen geometry changes. */
 class UIDesktopWidgetWatchdog : public QObject
 {
@@ -55 +54 @@
     /** Notifies about work-area recalculated for the host-screen with @a iHostScreenIndex. */
     void sigHostScreenWorkAreaRecalculated(int iHostScreenIndex);
-#endif /* VBOX_WS_X11 */
+#endif
 
 public:
 
     /** Returns the static instance of the desktop-widget watchdog. */
-    static UIDesktopWidgetWatchdog *instance() { return m_spInstance; }
+    static UIDesktopWidgetWatchdog *instance() { return s_pInstance; }
 
     /** Creates the static instance of the desktop-widget watchdog. */
@@ -121 +120 @@
     /** Stupid moc does not warn if it cannot find headers! */
     void QT_VERSION_NOT_DEFINED
-#else
+#else /* QT_VERSION != 0 */
     /** Handles @a pHostScreen adding. */
     void sltHostScreenAdded(QScreen *pHostScreen);
@@ -130 +129 @@
     /** Handles host-screen work-area resize to passed @a availableGeometry. */
     void sltHandleHostScreenWorkAreaResized(const QRect &availableGeometry);
-#endif
+#endif /* QT_VERSION != 0 */
 
 #ifdef VBOX_WS_X11
     /** Handles @a availableGeometry calculation result for the host-screen with @a iHostScreenIndex. */
     void sltHandleHostScreenAvailableGeometryCalculated(int iHostScreenIndex, QRect availableGeometry);
-#endif /* VBOX_WS_X11 */
+#endif
 
 private:
@@ -145 +144 @@
 
     /** Holds the static instance of the desktop-widget watchdog. */
-    static UIDesktopWidgetWatchdog *m_spInstance;
+    static UIDesktopWidgetWatchdog *s_pInstance;
 
 #ifdef VBOX_WS_X11