Changeset 51363 in vbox

Timestamp:

May 23, 2014 12:52:48 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Proper handling for global extra-data ID.

Location:

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

Files:

• UIExtraDataManager.cpp (modified) (12 diffs)
• UIExtraDataManager.h (modified) (2 diffs)

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

@@ -115 +115 @@
 /* static */
 UIExtraDataManager *UIExtraDataManager::m_pInstance = 0;
+QString UIExtraDataManager::m_sstrGlobalID = QUuid().toString().remove(QRegExp("[{}]"));
 
 /* static */
@@ -560 +561 @@
 
     /* Global extra-data 'change' event: */
-    if (QUuid(strMachineID).isNull())
+    if (strMachineID == m_sstrGlobalID)
     {
         if (strKey.startsWith("GUI/"))
@@ -610 +611 @@
 
     /* Make sure at least empty map is created: */
-    m_data[QString()] = ExtraDataMap();
+    m_data[m_sstrGlobalID] = ExtraDataMap();
 
     /* Load global extra-data map: */
     foreach (const QString &strKey, vbox.GetExtraDataKeys())
-        m_data[QString()][strKey] = vbox.GetExtraData(strKey);
+        m_data[m_sstrGlobalID][strKey] = vbox.GetExtraData(strKey);
 }
 
@@ -674 +675 @@
 void UIExtraDataManager::hotloadMachineExtraDataMap(const QString &strID) const
 {
-    /* Make sure it is not yet loaded: */
-    AssertReturnVoid(!strID.isNull() && !m_data.contains(strID));
+    /* Make sure it is valid ID: */
+    AssertReturnVoid(!strID.isNull() && strID != m_sstrGlobalID);
+    /* Which is not loaded yet: */
+    AssertReturnVoid(!m_data.contains(strID));
 
     /* Search for corresponding machine: */
@@ -694 +697 @@
 }
 
-bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = QString() */) const
+bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -715 +718 @@
 }
 
-bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = QString() */) const
+bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -746 +749 @@
 }
 
-QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = QString() */) const
+QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -763 +766 @@
 }
 
-void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID /* = QString() */)
+void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID /* = m_sstrGlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -776 +779 @@
 
     /* Global extra-data: */
-    if (strID.isNull())
+    if (strID == m_sstrGlobalID)
     {
         /* Get global object: */
@@ -795 +798 @@
 }
 
-QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = QString() */) const
+QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = m_sstrGlobalID */) const
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -813 +816 @@
 }
 
-void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = QString() */)
+void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = m_sstrGlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
-    if (!strID.isNull() && !m_data.contains(strID))
+    if (strID != m_sstrGlobalID && !m_data.contains(strID))
         hotloadMachineExtraDataMap(strID);
 
@@ -826 +829 @@
 
     /* Global extra-data: */
-    if (strID.isNull())
+    if (strID == m_sstrGlobalID)
     {
         /* Get global object: */

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

@@ -227 +227 @@
     /** 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 = QString()) const;
+    bool isFeatureAllowed(const QString &strKey, const QString &strID = m_sstrGlobalID) 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 = QString()) const;
+    bool isFeatureRestricted(const QString &strKey, const QString &strID = m_sstrGlobalID) const;
 
     /** Translates bool flag into 'allowed' value. */
@@ -239 +239 @@
     /** 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 = QString()) const;
+    QString extraDataString(const QString &strKey, const QString &strID = m_sstrGlobalID) 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 = QString());
+    void setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID = m_sstrGlobalID);
 
     /** 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 = QString()) const;
+    QStringList extraDataStringList(const QString &strKey, const QString &strID = m_sstrGlobalID) 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 = QString());
+    void setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID = m_sstrGlobalID);
 
     /** Singleton Extra-data Manager instance. */
     static UIExtraDataManager *m_pInstance;
+
+    /** Global extra-data ID. */
+    static QString m_sstrGlobalID;
 
     /** Main event-listener instance. */