Changeset 91336 in vbox

Timestamp:

Sep 22, 2021 7:46:54 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: A bit of refactoring for Add/New Cloud VM wizards; Some optimization.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• addcloudvm/UIWizardAddCloudVMPageSource.cpp (modified) (2 diffs)
• newcloudvm/UIWizardNewCloudVMPageSource.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageSource.cpp

@@ -54 +54 @@
     AssertPtrReturnVoid(pParent);
 
-    /* Block signals while updating: */
-    pCombo->blockSignals(true);
-
     /* Remember current item data to be able to restore it: */
     QString strOldData;
     if (pCombo->currentIndex() != -1)
-        strOldData = pCombo->itemData(pCombo->currentIndex(), ProviderData_ShortName).toString();
+        strOldData = pCombo->currentData(ProviderData_ShortName).toString();
     /* Otherwise "OCI" should be the default one: */
     else
         strOldData = "OCI";
+
+    /* Block signals while updating: */
+    pCombo->blockSignals(true);
 
     /* Clear combo initially: */
@@ -117 +117 @@
     AssertReturnVoid(comProvider.isNotNull());
 
-    /* Block signals while updating: */
-    pCombo->blockSignals(true);
-
     /* Remember current item data to be able to restore it: */
     QString strOldData;
     if (pCombo->currentIndex() != -1)
-        strOldData = pCombo->itemData(pCombo->currentIndex(), ProfileData_Name).toString();
+        strOldData = pCombo->currentData(ProfileData_Name).toString();
     else if (!strProfileName.isEmpty())
         strOldData = strProfileName;
+
+    /* Block signals while updating: */
+    pCombo->blockSignals(true);
 
     /* Clear combo initially: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp

@@ -57 +57 @@
     AssertPtrReturnVoid(pParent);
 
-    /* Block signals while updating: */
-    pCombo->blockSignals(true);
-
     /* Remember current item data to be able to restore it: */
     QString strOldData;
     if (pCombo->currentIndex() != -1)
-        strOldData = pCombo->itemData(pCombo->currentIndex(), ProviderData_ShortName).toString();
+        strOldData = pCombo->currentData(ProviderData_ShortName).toString();
     /* Otherwise "OCI" should be the default one: */
     else
         strOldData = "OCI";
+
+    /* Block signals while updating: */
+    pCombo->blockSignals(true);
 
     /* Clear combo initially: */
@@ -120 +120 @@
     AssertReturnVoid(comProvider.isNotNull());
 
-    /* Block signals while updating: */
-    pCombo->blockSignals(true);
-
     /* Remember current item data to be able to restore it: */
     QString strOldData;
     if (pCombo->currentIndex() != -1)
-        strOldData = pCombo->itemData(pCombo->currentIndex(), ProfileData_Name).toString();
+        strOldData = pCombo->currentData(ProfileData_Name).toString();
     else if (!strProfileName.isEmpty())
         strOldData = strProfileName;
+
+    /* Block signals while updating: */
+    pCombo->blockSignals(true);
 
     /* Clear combo initially: */