Changeset 66354 in vbox

Timestamp:

Mar 30, 2017 10:50:51 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: Couple of optimizations.

Location:

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

Files:

• UIGlobalSettingsDisplay.cpp (modified) (3 diffs)
• UIGlobalSettingsExtension.cpp (modified) (2 diffs)
• UIGlobalSettingsInput.cpp (modified) (1 diff)
• UIGlobalSettingsUpdate.cpp (modified) (2 diffs)

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

@@ -98 +98 @@
 
     /* Load old data from cache: */
-    if ((oldData.m_strMaxGuestResolution.isEmpty()) ||
-        (oldData.m_strMaxGuestResolution == "auto"))
+    if (   (oldData.m_strMaxGuestResolution.isEmpty())
+        || (oldData.m_strMaxGuestResolution == "auto"))
     {
         /* Switch combo-box item: */
@@ -114 +114 @@
         m_pMaxResolutionCombo->setCurrentIndex(m_pMaxResolutionCombo->findData("fixed"));
         /* Trying to parse text into 2 sections by ',' symbol: */
-        int iWidth  = oldData.m_strMaxGuestResolution.section(',', 0, 0).toInt();
-        int iHeight = oldData.m_strMaxGuestResolution.section(',', 1, 1).toInt();
+        const int iWidth  = oldData.m_strMaxGuestResolution.section(',', 0, 0).toInt();
+        const int iHeight = oldData.m_strMaxGuestResolution.section(',', 1, 1).toInt();
         /* And set values if they are present: */
         m_pResolutionWidthSpin->setValue(iWidth);
@@ -134 +134 @@
         newData.m_strMaxGuestResolution = QString();
     }
-    else if (m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString() == "any" ||
-             m_pResolutionWidthSpin->value() == 0 || m_pResolutionHeightSpin->value() == 0)
+    else if (   m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString() == "any"
+             || m_pResolutionWidthSpin->value() == 0 || m_pResolutionHeightSpin->value() == 0)
     {
         /* Else if resolution current combo item is "any"

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

@@ -281 +281 @@
 
     /* Gather old data: */
-    const CExtPackManager &manager = vboxGlobal().virtualBox().GetExtensionPackManager();
-    const CExtPackVector &packages = manager.GetInstalledExtPacks();
-    for (int i = 0; i < packages.size(); ++i)
+    const CExtPackVector &packages = vboxGlobal().virtualBox().
+                                     GetExtensionPackManager().GetInstalledExtPacks();
+    foreach (const CExtPack &package, packages)
     {
         UIDataSettingsGlobalExtensionItem item;
-        loadData(packages[i], item);
+        loadData(package, item);
         oldData.m_items << item;
     }
@@ -303 +303 @@
 
     /* Load old data from cache: */
-    for (int i = 0; i < oldData.m_items.size(); ++i)
-        new UIExtensionPackageItem(m_pPackagesTree, oldData.m_items.at(i));
+    foreach (const UIDataSettingsGlobalExtensionItem &item, oldData.m_items)
+        new UIExtensionPackageItem(m_pPackagesTree, item);
     /* If at least one item present: */
     if (m_pPackagesTree->topLevelItemCount())

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

@@ -951 +951 @@
     {
         /* Save host-combo shortcut from cache: */
-        UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
+        const UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
         const int iHostComboItemBase = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_pCache->base().shortcuts(), fakeHostComboItem);
         const int iHostComboItemData = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_pCache->data().shortcuts(), fakeHostComboItem);

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

@@ -92 +92 @@
 
     /* Gather old data: */
-    VBoxUpdateData updateData(gEDataManager->applicationUpdateData());
+    const VBoxUpdateData updateData(gEDataManager->applicationUpdateData());
     oldData.m_fCheckEnabled = !updateData.isNoNeedToCheck();
     oldData.m_periodIndex = updateData.periodIndex();
@@ -148 +148 @@
     {
         /* Gather corresponding values from internal variables: */
-        VBoxUpdateData newData(m_pCache->data().m_periodIndex, m_pCache->data().m_branchIndex);
+        const VBoxUpdateData newData(m_pCache->data().m_periodIndex, m_pCache->data().m_branchIndex);
         gEDataManager->setApplicationUpdateData(newData.data());
     }