Changeset 88019 in vbox for trunk

Timestamp:

Mar 8, 2021 3:40:22 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143147

Message:

FE/Qt: bugref:9950. Small refactoring

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVM.h (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -633 +633 @@
 }
 
+void UIWizardNewVM::setVirtualDisk(const QUuid &mediumId)
+{
+    if (m_virtualDisk.GetId() == mediumId)
+        return;
+    CMedium medium = uiCommon().medium(mediumId).medium();
+    if (!medium.isNull())
+        setVirtualDisk(medium);
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -98 +98 @@
     CMedium &virtualDisk();
     void setVirtualDisk(const CMedium &medium);
+    void setVirtualDisk(const QUuid &mediumId);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.cpp

@@ -429 +429 @@
 void UIWizardNewVMPageBasic4::setVirtualDiskFromDiskCombo()
 {
-    QUuid currentId;
+    AssertReturnVoid(m_pDiskSelector);
     UIWizardNewVM *pWizard = wizardImp();
     AssertReturnVoid(pWizard);
-    if (!pWizard->virtualDisk().isNull())
-        currentId = pWizard->virtualDisk().GetId();
-    QUuid id = m_pDiskSelector->id();
-    /* Do nothing else if m_virtualMedium is already set to what combobox has: */
-    if (id == currentId)
-        return;
-    if (m_pDiskSelector)
-    {
-        CMedium medium = uiCommon().medium(id).medium();
-        if (!medium.isNull())
-            pWizard->setVirtualDisk(medium);
-    }
-}
+    pWizard->setVirtualDisk(m_pDiskSelector->id());
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -236 +236 @@
                 this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
 
-    if (m_pDiskSelectionButton)
-        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
-                this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
-
     if (m_pBaseMemoryEditor)
         connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
@@ -250 +246 @@
         connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
                 this, &UIWizardNewVMPageExpert::sltMediumFormatChanged);
+
     if (m_pSizeEditor)
         connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
                 this, &UIWizardNewVMPageExpert::sltMediumSizeChanged);
+
+    if (m_pDiskSelectionButton)
+        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
+                this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
 
     if (m_pDiskSelector)
@@ -667 +668 @@
 void UIWizardNewVMPageExpert::setVirtualDiskFromDiskCombo()
 {
-    QUuid currentId;
+    AssertReturnVoid(m_pDiskSelector);
     UIWizardNewVM *pWizard = wizardImp();
     AssertReturnVoid(pWizard);
-    if (!pWizard->virtualDisk().isNull())
-        currentId = pWizard->virtualDisk().GetId();
-    QUuid id = m_pDiskSelector->id();
-    /* Do nothing else if m_virtualMedium is already set to what combobox has: */
-    if (id == currentId)
-        return;
-    if (m_pDiskSelector)
-    {
-        CMedium medium = uiCommon().medium(id).medium();
-        if (!medium.isNull())
-            pWizard->setVirtualDisk(medium);
-    }
-}
+    pWizard->setVirtualDisk(m_pDiskSelector->id());
+}