Changeset 82348 in vbox

Timestamp:

Dec 3, 2019 5:20:35 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9611: UIMachineSettingsSystem: Another nit for r135112 (s.a. r135113).

Location:

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

Files:

• UIMachineSettingsSystem.cpp (modified) (6 diffs)
• UIMachineSettingsSystem.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -288 +288 @@
 
     /* Load old 'Acceleration' data from the cache: */
-    const int iParavirtProviderPosition = m_pComboParavirtProvider->findData(oldSystemData.m_paravirtProvider);
-    m_pComboParavirtProvider->setCurrentIndex(iParavirtProviderPosition == -1 ? 0 : iParavirtProviderPosition);
+    const int iParavirtProviderPosition = m_pComboParavirtProviderType->findData(oldSystemData.m_paravirtProvider);
+    m_pComboParavirtProviderType->setCurrentIndex(iParavirtProviderPosition == -1 ? 0 : iParavirtProviderPosition);
     m_pCheckBoxVirtualization->setChecked(oldSystemData.m_fEnabledHwVirtEx);
     m_pCheckBoxNestedPaging->setChecked(oldSystemData.m_fEnabledNestedPaging);
@@ -328 +328 @@
 
     /* Gather 'Acceleration' data: */
-    newSystemData.m_paravirtProvider = m_pComboParavirtProvider->currentData().value<KParavirtProvider>();
+    newSystemData.m_paravirtProvider = m_pComboParavirtProviderType->currentData().value<KParavirtProvider>();
     /* Enable HW Virt Ex automatically if it's supported and
      * 1. multiple CPUs, 2. Nested Paging or 3. Nested HW Virt Ex is requested. */
@@ -561 +561 @@
     setTabOrder(m_pEditorCPUCount, m_pSliderCPUExecCap);
     setTabOrder(m_pSliderCPUExecCap, m_pEditorCPUExecCap);
-    setTabOrder(m_pEditorCPUExecCap, m_pComboParavirtProvider);
+    setTabOrder(m_pEditorCPUExecCap, m_pComboParavirtProviderType);
 
     /* Configure navigation for 'acceleration' tab: */
-    setTabOrder(m_pComboParavirtProvider, m_pCheckBoxPAE);
+    setTabOrder(m_pComboParavirtProviderType, m_pCheckBoxPAE);
     setTabOrder(m_pCheckBoxPAE, m_pCheckBoxNestedVirtualization);
     setTabOrder(m_pCheckBoxNestedVirtualization, m_pCheckBoxVirtualization);
@@ -631 +631 @@
                                             || (systemData.m_fEnabledNestedPaging && isMachineOffline())));
     m_pLabelParavirtProvider->setEnabled(isMachineOffline());
-    m_pComboParavirtProvider->setEnabled(isMachineOffline());
+    m_pComboParavirtProviderType->setEnabled(isMachineOffline());
     m_pLabelVirtualization->setEnabled(isMachineOffline());
 }
@@ -909 +909 @@
 void UIMachineSettingsSystem::repopulateComboParavirtProviderType()
 {
-    /* Paravirtualization Provider combo-box created in the .ui file. */
-    AssertPtrReturnVoid(m_pComboParavirtProvider);
+    /* Paravirtualization Provider Type combo-box created in the .ui file. */
+    AssertPtrReturnVoid(m_pComboParavirtProviderType);
     {
         /* Clear combo first of all: */
-        m_pComboParavirtProvider->clear();
-
-        /* Load currently supported paravirtualization providers: */
+        m_pComboParavirtProviderType->clear();
+
+        /* Load currently supported paravirtualization provider types: */
         CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-        QVector<KParavirtProvider> supportedProviders = comProperties.GetSupportedParavirtProviders();
+        QVector<KParavirtProvider> supportedProviderTypes = comProperties.GetSupportedParavirtProviders();
         /* Take into account currently cached value: */
         const KParavirtProvider enmCachedValue = m_pCache->base().m_paravirtProvider;
-        if (!supportedProviders.contains(enmCachedValue))
-            supportedProviders.prepend(enmCachedValue);
+        if (!supportedProviderTypes.contains(enmCachedValue))
+            supportedProviderTypes.prepend(enmCachedValue);
 
         /* Populate combo finally: */
-        foreach (const KParavirtProvider &enmProvider, supportedProviders)
-            m_pComboParavirtProvider->addItem(gpConverter->toString(enmProvider), QVariant::fromValue(enmProvider));
+        foreach (const KParavirtProvider &enmProvider, supportedProviderTypes)
+            m_pComboParavirtProviderType->addItem(gpConverter->toString(enmProvider), QVariant::fromValue(enmProvider));
     }
 }
@@ -961 +961 @@
 void UIMachineSettingsSystem::retranslateComboParavirtProvider()
 {
-    /* For each the element in m_pComboParavirtProvider: */
-    for (int iIndex = 0; iIndex < m_pComboParavirtProvider->count(); ++iIndex)
+    /* For each the element in m_pComboParavirtProviderType: */
+    for (int iIndex = 0; iIndex < m_pComboParavirtProviderType->count(); ++iIndex)
     {
         /* Apply retranslated text: */
-        const KParavirtProvider enmType = m_pComboParavirtProvider->currentData().value<KParavirtProvider>();
-        m_pComboParavirtProvider->setItemText(iIndex, gpConverter->toString(enmType));
+        const KParavirtProvider enmType = m_pComboParavirtProviderType->currentData().value<KParavirtProvider>();
+        m_pComboParavirtProviderType->setItemText(iIndex, gpConverter->toString(enmType));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui

@@ -414 +414 @@
          </property>
          <property name="buddy">
-          <cstring>m_pComboParavirtProvider</cstring>
+          <cstring>m_pComboParavirtProviderType</cstring>
          </property>
         </widget>
@@ -421 +421 @@
         <layout class="QHBoxLayout">
          <item>
-          <widget class="QComboBox" name="m_pComboParavirtProvider">
+          <widget class="QComboBox" name="m_pComboParavirtProviderType">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">