Changeset 91697 in vbox for trunk/src

Timestamp:

Oct 12, 2021 5:34:29 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: A bit of cleanup for redundant stuff in UIWizardAddCloudVM.

Location:

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

Files:

• UIWizardAddCloudVMPageExpert.cpp (modified) (3 diffs)
• UIWizardAddCloudVMPageExpert.h (modified) (1 diff)
• UIWizardAddCloudVMPageSource.cpp (modified) (3 diffs)
• UIWizardAddCloudVMPageSource.h (modified) (1 diff)

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

@@ -208 +208 @@
 void UIWizardAddCloudVMPageExpert::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -214 +224 @@
 void UIWizardAddCloudVMPageExpert::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update profile instances: */
+    populateProfileInstances(m_pSourceInstanceList, wizard()->client());
+    sltHandleSourceInstanceChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -226 +244 @@
 void UIWizardAddCloudVMPageExpert::sltHandleSourceInstanceChange()
 {
-    updateSourceInstance();
+    /* Update wizard fields: */
+    wizard()->setInstanceIds(currentListWidgetData(m_pSourceInstanceList));
+
+    /* Notify about changes: */
     emit completeChanged();
 }
-
-void UIWizardAddCloudVMPageExpert::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardAddCloudVMPageExpert::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    populateProfileInstances(m_pSourceInstanceList, wizard()->client());
-    updateSourceInstance();
-}
-
-void UIWizardAddCloudVMPageExpert::updateSourceInstance()
-{
-    wizard()->setInstanceIds(currentListWidgetData(m_pSourceInstanceList));
-}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h

@@ -72 +72 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source instance. */
-    void updateSourceInstance();
-
     /** Holds the provider container instance. */
     QGroupBox *m_pCntProvider;

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

@@ -460 +460 @@
 void UIWizardAddCloudVMPageSource::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -466 +476 @@
 void UIWizardAddCloudVMPageSource::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update profile instances: */
+    populateProfileInstances(m_pSourceInstanceList, wizard()->client());
+    sltHandleSourceInstanceChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -478 +496 @@
 void UIWizardAddCloudVMPageSource::sltHandleSourceInstanceChange()
 {
-    updateSourceInstance();
+    /* Update wizard fields: */
+    wizard()->setInstanceIds(currentListWidgetData(m_pSourceInstanceList));
+
+    /* Notify about changes: */
     emit completeChanged();
 }
-
-void UIWizardAddCloudVMPageSource::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardAddCloudVMPageSource::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    populateProfileInstances(m_pSourceInstanceList, wizard()->client());
-    updateSourceInstance();
-}
-
-void UIWizardAddCloudVMPageSource::updateSourceInstance()
-{
-    wizard()->setInstanceIds(currentListWidgetData(m_pSourceInstanceList));
-}

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

@@ -113 +113 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source instance. */
-    void updateSourceInstance();
-
     /** Holds the main label instance. */
     QIRichTextLabel *m_pLabelMain;