Changeset 61191 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 25, 2016 2:21:50 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Extra-data Manager: Continue with the r106215 to use the same approach on base extra-data getters.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (modified) (2 diffs)

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

@@ -2080 +2080 @@
 QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = GlobalID */)
 {
-    /* Hot-load machine extra-data map if necessary: */
-    if (strID != GlobalID && !m_data.contains(strID))
-        hotloadMachineExtraDataMap(strID);
-
-    // TODO: Check if we can avoid copying here..
-    /* Make a read-only copy of the corresponding map: */
-    const ExtraDataMap data = m_data.value(strID);
-
-    /* QString() if value was not set: */
-    if (!data.contains(strKey))
+    /* Get the value. Return 'QString()' if not found: */
+    const QString strValue = extraDataStringUnion(strKey, strID);
+    if (strValue.isNull())
         return QString();
 
     /* Returns corresponding value: */
-    return data[strKey];
+    return strValue;
 }
 
@@ -2188 +2181 @@
 QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = GlobalID */)
 {
-    /* Hot-load machine extra-data map if necessary: */
-    if (strID != GlobalID && !m_data.contains(strID))
-        hotloadMachineExtraDataMap(strID);
-
-    /* Read-only access corresponding map: */
-    const ExtraDataMap data = m_data.value(strID);
-
-    /* QStringList() if machine value was not set: */
-    if (!data.contains(strKey))
+    /* Get the value. Return 'QStringList()' if not found: */
+    const QString strValue = extraDataStringUnion(strKey, strID);
+    if (strValue.isNull())
         return QStringList();
 
     /* Few old extra-data string-lists were separated with 'semicolon' symbol.
      * All new separated by 'comma'. We have to take that into account. */
-    return data[strKey].split(QRegExp("[;,]"), QString::SkipEmptyParts);
+    return strValue.split(QRegExp("[;,]"), QString::SkipEmptyParts);
 }