Changeset 85044 in vbox

Timestamp:

Jul 3, 2020 6:18:15 AM (5 years ago)

Author:

vboxsync

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

138947

Message:

FE/Qt: bugref:9515. Refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (5 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp ) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic1.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicNameType.h )
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -651 +651 @@
         src/wizards/newvm/UIWizardNewVM.h \
         src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.h \
-        src/wizards/newvm/UIWizardNewVMPageBasicNameType.h \
+        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
         src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.h \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.h \
@@ -1116 +1116 @@
         src/wizards/newvm/UIWizardNewVM.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicUserNameHostname.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp \

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

@@ -19 +19 @@
 #include "UICommon.h"
 #include "UIWizardNewVM.h"
-#include "UIWizardNewVMPageBasicNameType.h"
+#include "UIWizardNewVMPageBasic1.h"
 #include "UIWizardNewVMPageBasicHardware.h"
 #include "UIWizardNewVMPageBasicProductKey.h"
@@ -77 +77 @@
         case WizardMode_Basic:
         {
-            setPage(PageNameType, new UIWizardNewVMPageBasicNameType(m_strGroup));
+            setPage(Page1, new UIWizardNewVMPageBasicNameType(m_strGroup));
             setPage(PageUserNameHostname, new UIWizardNewVMPageBasicUserNameHostname);
             setPage(PageGAInstall, new UIWizardNewVMPageBasicGAInstall);
@@ -83 +83 @@
             setPage(PageHardware, new UIWizardNewVMPageBasicHardware);
             setPage(PageDisk, new UIWizardNewVMPageBasicDisk);
-            setStartId(PageNameType);
+            setStartId(Page1);
             break;
         }
@@ -406 +406 @@
         case WizardMode_Basic:
         {
-            UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(PageNameType));
+            UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(Page1));
             /* Make sure that we were able to find the page that created the folder. */
             Assert(pPage);
@@ -427 +427 @@
 void UIWizardNewVM::sltHandleDetectedOSTypeChange()
 {
-    UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*>(page(PageNameType));
+    UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*>(page(Page1));
     if (!pPage)
         return;

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

@@ -60 +60 @@
     enum
     {
-        PageNameType,
+        Page1,
         PageUserNameHostname,
         PageGAInstall,

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

@@ -29 +29 @@
 #include "UIMessageCenter.h"
 #include "UINameAndSystemEditor.h"
-#include "UIWizardNewVMPageBasicNameType.h"
+#include "UIWizardNewVMPageBasic1.h"
 #include "UIWizardNewVM.h"
 

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

@@ -23 +23 @@
 
 /* Local includes: */
-#include "UIWizardNewVMPageBasicNameType.h"
+#include "UIWizardNewVMPageBasic1.h"
 #include "UIWizardNewVMPageBasicHardware.h"
 #include "UIWizardNewVMPageBasicDisk.h"