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

Timestamp:

Feb 8, 2017 4:21:23 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: Extension page: Get rid of superfluous data member, using mutable cache access instead.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDefs.h (modified) (1 diff)
• global/UIGlobalSettingsExtension.cpp (modified) (4 diffs)
• global/UIGlobalSettingsExtension.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h

@@ -63 +63 @@
     /* Returns the NON-modifiable REFERENCE to the current cached data: */
     const CacheData& data() const { return m_value.second; }
+    /* Returns the modifiable REFERENCE to the current cached data: */
+    CacheData &data() { return m_value.second; }
 
     /* We assume that old cache item was removed if

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -263 +263 @@
 void UIGlobalSettingsExtension::getFromCache()
 {
-    /* Get old/new data from cache: */
-    m_data = m_cache.base();
+    /* Get old data from cache: */
+    const UIDataSettingsGlobalExtension &oldData = m_cache.base();
 
     /* Load old data from cache: */
-    for (int i = 0; i < m_data.m_items.size(); ++i)
-        new UIExtensionPackageItem(m_pPackagesTree, m_data.m_items[i]);
+    for (int i = 0; i < oldData.m_items.size(); ++i)
+        new UIExtensionPackageItem(m_pPackagesTree, oldData.m_items.at(i));
     /* If at least one item present: */
     if (m_pPackagesTree->topLevelItemCount())
@@ -378 +378 @@
         {
             /* Remove it from the cache. */
-            for (int i = 0; i < m_data.m_items.size(); i++)
-                if (!strExtPackName.compare(m_data.m_items[i].m_strName, Qt::CaseInsensitive))
+            for (int i = 0; i < m_cache.data().m_items.size(); ++i)
+            {
+                if (!strExtPackName.compare(m_cache.data().m_items.at(i).m_strName, Qt::CaseInsensitive))
                 {
-                    m_data.m_items.removeAt(i);
+                    m_cache.data().m_items.removeAt(i);
                     break;
                 }
+            }
 
             /* Remove it from the tree. */
@@ -402 +404 @@
             if (package.isOk())
             {
-                m_data.m_items << fetchData(package);
-
-                UIExtensionPackageItem *pItem = new UIExtensionPackageItem(m_pPackagesTree, m_data.m_items.last());
+                m_cache.data().m_items << fetchData(package);
+
+                UIExtensionPackageItem *pItem = new UIExtensionPackageItem(m_pPackagesTree, m_cache.data().m_items.last());
                 m_pPackagesTree->setCurrentItem(pItem);
                 m_pPackagesTree->sortByColumn(1, Qt::AscendingOrder);
@@ -445 +447 @@
                 {
                     /* Remove selected package from cache: */
-                    for (int i = 0; i < m_data.m_items.size(); ++i)
+                    for (int i = 0; i < m_cache.data().m_items.size(); ++i)
                     {
-                        if (!strSelectedPackageName.compare(m_data.m_items[i].m_strName, Qt::CaseInsensitive))
+                        if (!strSelectedPackageName.compare(m_cache.data().m_items.at(i).m_strName, Qt::CaseInsensitive))
                         {
-                            m_data.m_items.removeAt(i);
+                            m_cache.data().m_items.removeAt(i);
                             break;
                         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h

@@ -152 +152 @@
     /* Cache: */
     UISettingsCacheGlobalExtension m_cache;
-    UIDataSettingsGlobalExtension m_data;
 };