Changeset 87885 in vbox

Timestamp:

Feb 26, 2021 1:23:06 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Removing one of the 2 CMedium instances

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (2 diffs)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMPageBasic4.h (modified) (2 diffs)

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

@@ -222 +222 @@
     }
 
+    /* Inform UICommon about it: */
+    uiCommon().createMedium(UIMedium(virtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
+
     /* Remember created virtual-disk: */
-    m_virtualDisk = virtualDisk;
-
-    /* Inform UICommon about it: */
-    uiCommon().createMedium(UIMedium(m_virtualDisk, UIMediumDeviceType_HardDisk, KMediumState_Created));
+    setVirtualDisk(virtualDisk);
 
     return true;
@@ -605 +605 @@
 }
 
+CMedium UIWizardNewVM::virtualDisk() const
+{
+    UIWizardNewVMPageBasic4 *pPage = qobject_cast<UIWizardNewVMPageBasic4*>(page(Page4));
+    AssertPtrReturn(pPage, CMedium());
+    return pPage->virtualDisk();
+}
+
+void UIWizardNewVM::setVirtualDisk(const CMedium &medium)
+{
+    UIWizardNewVMPageBasic4 *pPage = qobject_cast<UIWizardNewVMPageBasic4*>(page(Page4));
+    AssertPtrReturnVoid(pPage);
+    pPage->setVirtualDisk(medium);
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

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

@@ -120 +120 @@
     void setFieldsFromDefaultUnttendedInstallData();
 
+    CMedium virtualDisk() const;
+    void setVirtualDisk(const CMedium &medium);
+
     /* Variables: */
     CMachine m_machine;
@@ -129 +132 @@
     int m_iSASCount;
     int m_iUSBCount;
-    CMedium m_virtualDisk;
 
     mutable UIUnattendedInstallData m_unattendedInstallData;

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

@@ -42 +42 @@
 {
 
+public:
+
+    const CMedium &virtualDisk() const { return m_virtualDisk; }
+    void setVirtualDisk(const CMedium &virtualDisk) { m_virtualDisk = virtualDisk; }
+
 protected:
 
@@ -55 +60 @@
     /** @name Property getters/setters
      * @{ */
-       CMedium virtualDisk() const { return m_virtualDisk; }
-       void setVirtualDisk(const CMedium &virtualDisk) { m_virtualDisk = virtualDisk; }
        QUuid virtualDiskId() const { return m_uVirtualDiskId; }
        void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; }