Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51926)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51927)
@@ -118,6 +118,6 @@
 
 /* static */
-UIExtraDataManager *UIExtraDataManager::m_pInstance = 0;
-QString UIExtraDataManager::m_sstrGlobalID = QUuid().toString().remove(QRegExp("[{}]"));
+UIExtraDataManager *UIExtraDataManager::m_spInstance = 0;
+const QString UIExtraDataManager::GlobalID = QUuid().toString().remove(QRegExp("[{}]"));
 
 /* static */
@@ -125,11 +125,11 @@
 {
     /* Create/prepare instance if not yet exists: */
-    if (!m_pInstance)
+    if (!m_spInstance)
     {
         new UIExtraDataManager;
-        m_pInstance->prepare();
+        m_spInstance->prepare();
     }
     /* Return instance: */
-    return m_pInstance;
+    return m_spInstance;
 }
 
@@ -138,8 +138,8 @@
 {
     /* Destroy/cleanup instance if still exists: */
-    if (m_pInstance)
-    {
-        m_pInstance->cleanup();
-        delete m_pInstance;
+    if (m_spInstance)
+    {
+        m_spInstance->cleanup();
+        delete m_spInstance;
     }
 }
@@ -149,5 +149,5 @@
 {
     /* Connect to static instance: */
-    m_pInstance = this;
+    m_spInstance = this;
 }
 
@@ -155,5 +155,5 @@
 {
     /* Disconnect from static instance: */
-    m_pInstance = 0;
+    m_spInstance = 0;
 }
 
@@ -437,5 +437,5 @@
 {
     /* Read-only access global extra-data map: */
-    const ExtraDataMap &data = m_data[m_sstrGlobalID];
+    const ExtraDataMap &data = m_data[GlobalID];
     /* Wipe-out each the group definition record: */
     foreach (const QString &strKey, data.keys())
@@ -1165,5 +1165,5 @@
 
     /* Global extra-data 'change' event: */
-    if (strMachineID == m_sstrGlobalID)
+    if (strMachineID == GlobalID)
     {
         if (strKey.startsWith("GUI/"))
@@ -1215,9 +1215,9 @@
 
     /* Make sure at least empty map is created: */
-    m_data[m_sstrGlobalID] = ExtraDataMap();
+    m_data[GlobalID] = ExtraDataMap();
 
     /* Load global extra-data map: */
     foreach (const QString &strKey, vbox.GetExtraDataKeys())
-        m_data[m_sstrGlobalID][strKey] = vbox.GetExtraData(strKey);
+        m_data[GlobalID][strKey] = vbox.GetExtraData(strKey);
 }
 
@@ -1280,5 +1280,5 @@
 {
     /* Make sure it is valid ID: */
-    AssertMsgReturnVoid(!strID.isNull() && strID != m_sstrGlobalID,
+    AssertMsgReturnVoid(!strID.isNull() && strID != GlobalID,
                         ("Invalid VM ID = {%s}\n", strID.toAscii().constData()));
     /* Which is not loaded yet: */
@@ -1302,8 +1302,8 @@
 }
 
-bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
+bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = GlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1323,8 +1323,8 @@
 }
 
-bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
+bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = GlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1354,8 +1354,8 @@
 }
 
-QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
+QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = GlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1371,8 +1371,8 @@
 }
 
-void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID /* = m_sstrGlobalID */)
+void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1384,5 +1384,5 @@
 
     /* Global extra-data: */
-    if (strID == m_sstrGlobalID)
+    if (strID == GlobalID)
     {
         /* Get global object: */
@@ -1403,8 +1403,8 @@
 }
 
-QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
+QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = GlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1421,8 +1421,8 @@
 }
 
-void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = m_sstrGlobalID */)
+void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (strID != m_sstrGlobalID && !m_data.contains(strID))
+    if (strID != GlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -1434,5 +1434,5 @@
 
     /* Global extra-data: */
-    if (strID == m_sstrGlobalID)
+    if (strID == GlobalID)
     {
         /* Get global object: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51926)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51927)
@@ -67,4 +67,7 @@
 
 public:
+
+    /** Global extra-data ID. */
+    static const QString GlobalID;
 
     /** Static Extra-data Manager instance/constructor. */
@@ -408,8 +411,8 @@
     /** Determines whether feature corresponding to passed @a strKey is allowed.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    bool isFeatureAllowed(const QString &strKey, const QString &strID = m_sstrGlobalID) const;
+    bool isFeatureAllowed(const QString &strKey, const QString &strID = GlobalID) const;
     /** Determines whether feature corresponding to passed @a strKey is restricted.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    bool isFeatureRestricted(const QString &strKey, const QString &strID = m_sstrGlobalID) const;
+    bool isFeatureRestricted(const QString &strKey, const QString &strID = GlobalID) const;
 
     /** Translates bool flag into 'allowed' value. */
@@ -420,15 +423,15 @@
     /** Returns extra-data value corresponding to passed @a strKey as QString.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    QString extraDataString(const QString &strKey, const QString &strID = m_sstrGlobalID) const;
+    QString extraDataString(const QString &strKey, const QString &strID = GlobalID) const;
     /** Defines extra-data value corresponding to passed @a strKey as strValue.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    void setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID = m_sstrGlobalID);
+    void setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID = GlobalID);
 
     /** Returns extra-data value corresponding to passed @a strKey as QStringList.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    QStringList extraDataStringList(const QString &strKey, const QString &strID = m_sstrGlobalID) const;
+    QStringList extraDataStringList(const QString &strKey, const QString &strID = GlobalID) const;
     /** Defines extra-data value corresponding to passed @a strKey as strValue.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    void setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID = m_sstrGlobalID);
+    void setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID = GlobalID);
 
     /** Returns string consisting of @a strBase appended with @a uScreenIndex for the *non-primary* screen-index.
@@ -437,15 +440,12 @@
 
     /** Singleton Extra-data Manager instance. */
-    static UIExtraDataManager *m_pInstance;
-
-    /** Global extra-data ID. */
-    static QString m_sstrGlobalID;
-
-    /** Main event-listener instance. */
+    static UIExtraDataManager *m_spInstance;
+
+    /** Holds main event-listener instance. */
     CEventListener m_listener;
-    /** Extra-data event-handler instance. */
+    /** Holds extra-data event-handler instance. */
     UIExtraDataEventHandler *m_pHandler;
 
-    /** Extra-data map. */
+    /** Holds extra-data map instance. */
     mutable QMap<QString, ExtraDataMap> m_data;
 };