Changeset 71580 in vbox for trunk/src

Timestamp:

Mar 30, 2018 10:33:47 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Forgot something in r121405.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extradata

Files:

• UIExtraDataManager.cpp (modified) (5 diffs)
• UIExtraDataManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2046 +2046 @@
 
 /* static */
-UIExtraDataManager *UIExtraDataManager::m_spInstance = 0;
+UIExtraDataManager *UIExtraDataManager::s_pInstance = 0;
 const QString UIExtraDataManager::GlobalID = QUuid().toString().remove(QRegExp("[{}]"));
 
@@ -2053 +2053 @@
 {
     /* Create/prepare instance if not yet exists: */
-    if (!m_spInstance)
+    if (!s_pInstance)
     {
         new UIExtraDataManager;
-        m_spInstance->prepare();
+        s_pInstance->prepare();
     }
     /* Return instance: */
-    return m_spInstance;
+    return s_pInstance;
 }
 
@@ -2066 +2066 @@
 {
     /* Destroy/cleanup instance if still exists: */
-    if (m_spInstance)
-    {
-        m_spInstance->cleanup();
-        delete m_spInstance;
+    if (s_pInstance)
+    {
+        s_pInstance->cleanup();
+        delete s_pInstance;
     }
 }
@@ -2245 +2245 @@
 {
     /* Connect to static instance: */
-    m_spInstance = this;
+    s_pInstance = this;
 }
 
@@ -2251 +2251 @@
 {
     /* Disconnect from static instance: */
-    m_spInstance = 0;
+    s_pInstance = 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -732 +732 @@
     static QString extraDataKeyPerScreen(const QString &strBase, ulong uScreenIndex, bool fSameRuleForPrimary = false);
 
-    /** Singleton Extra-data Manager instance. */
-    static UIExtraDataManager *m_spInstance;
+    /** Holds the singleton instance. */
+    static UIExtraDataManager *s_pInstance;
 
     /** Holds extra-data event-handler instance. */