Changeset 87589 in vbox

Timestamp:

Feb 3, 2021 5:17:19 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Renaming page5 as page4.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic4.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.cpp ) (17 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic4.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.h ) (7 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -656 +656 @@
         src/wizards/newvm/UIWizardNewVMPageBasic2.h \
         src/wizards/newvm/UIWizardNewVMPageBasic3.h \
-        src/wizards/newvm/UIWizardNewVMPageBasic5.h \
+        src/wizards/newvm/UIWizardNewVMPageBasic4.h \
         src/wizards/newvm/UIWizardNewVMPageExpert.h \
         src/wizards/clonevm/UIWizardCloneVM.h \
@@ -1138 +1138 @@
         src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasic5.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
         src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
         src/wizards/clonevm/UIWizardCloneVM.cpp \

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

@@ -26 +26 @@
 #include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVMPageBasic3.h"
-#include "UIWizardNewVMPageBasic5.h"
+#include "UIWizardNewVMPageBasic4.h"
 #include "UIWizardNewVMPageExpert.h"
 #include "UIMessageCenter.h"
@@ -83 +83 @@
             setPage(Page2, new UIWizardNewVMPageBasic2);
             setPage(Page3, new UIWizardNewVMPageBasic3);
-            setPage(Page5, new UIWizardNewVMPageBasic5);
+            setPage(Page4, new UIWizardNewVMPageBasic4);
             setStartId(Page1);
             break;

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

@@ -63 +63 @@
         Page2,
         Page3,
-        Page5,
+        Page4,
         PageMax
     };
@@ -99 +99 @@
 
     /* Who will be able to create virtual-machine: */
-    friend class UIWizardNewVMPageBasic5;
+    friend class UIWizardNewVMPageBasic4;
     friend class UIWizardNewVMPageExpert;
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic5 class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasic4 class implementation.
  */
 
@@ -32 +32 @@
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVM.h"
-#include "UIWizardNewVMPageBasic5.h"
-
-UIWizardNewVMPage5::UIWizardNewVMPage5()
+#include "UIWizardNewVMPageBasic4.h"
+
+UIWizardNewVMPage4::UIWizardNewVMPage4()
     : m_fRecommendedNoDisk(false)
     , m_pDiskSkip(0)
@@ -44 +44 @@
 }
 
-void UIWizardNewVMPage5::updateVirtualDiskSource()
+void UIWizardNewVMPage4::updateVirtualDiskSource()
 {
     if (!m_pDiskSelector || !m_pVMMButton)
@@ -68 +68 @@
 }
 
-void UIWizardNewVMPage5::getWithFileOpenDialog()
+void UIWizardNewVMPage4::getWithFileOpenDialog()
 {
     /* Get opened medium id: */
@@ -91 +91 @@
 }
 
-bool UIWizardNewVMPage5::getWithNewVirtualDiskWizard()
+bool UIWizardNewVMPage4::getWithNewVirtualDiskWizard()
 {
     /* Create New Virtual Hard Drive wizard: */
@@ -113 +113 @@
 }
 
-void UIWizardNewVMPage5::ensureNewVirtualDiskDeleted()
+void UIWizardNewVMPage4::ensureNewVirtualDiskDeleted()
 {
     /* Make sure virtual-disk valid: */
@@ -137 +137 @@
 }
 
-void UIWizardNewVMPage5::retranslateWidgets()
+void UIWizardNewVMPage4::retranslateWidgets()
 {
     if (m_pDiskSkip)
@@ -149 +149 @@
 }
 
-QWidget *UIWizardNewVMPage5::createDiskWidgets()
+QWidget *UIWizardNewVMPage4::createDiskWidgets()
 {
     QWidget *pDiskContainer = new QWidget;
@@ -179 +179 @@
 }
 
-UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5()
+UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     : m_pLabel(0)
 {
@@ -190 +190 @@
 }
 
-void UIWizardNewVMPageBasic5::prepare()
+void UIWizardNewVMPageBasic4::prepare()
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
@@ -203 +203 @@
 }
 
-void UIWizardNewVMPageBasic5::createConnections()
+void UIWizardNewVMPageBasic4::createConnections()
 {
     connect(m_pDiskSkip, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
     connect(m_pDiskCreate, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
     connect(m_pDiskPresent, &QRadioButton::toggled,
-            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
     connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-            this, &UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged);
+            this, &UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged);
     connect(m_pVMMButton, &QIToolButton::clicked,
-            this, &UIWizardNewVMPageBasic5::sltGetWithFileOpenDialog);
-}
-
-void UIWizardNewVMPageBasic5::sltVirtualDiskSourceChanged()
+            this, &UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog);
+}
+
+void UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged()
 {
     /* Call to base-class: */
@@ -226 +226 @@
 }
 
-void UIWizardNewVMPageBasic5::sltGetWithFileOpenDialog()
+void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
 {
     /* Call to base-class: */
@@ -232 +232 @@
 }
 
-void UIWizardNewVMPageBasic5::retranslateUi()
+void UIWizardNewVMPageBasic4::retranslateUi()
 {
     setTitle(UIWizardNewVM::tr("Hard disk and Hardware"));
@@ -250 +250 @@
 }
 
-void UIWizardNewVMPageBasic5::initializePage()
+void UIWizardNewVMPageBasic4::initializePage()
 {
     retranslateUi();
@@ -281 +281 @@
 }
 
-void UIWizardNewVMPageBasic5::cleanupPage()
+void UIWizardNewVMPageBasic4::cleanupPage()
 {
     /* Call to base-class: */
@@ -288 +288 @@
 }
 
-bool UIWizardNewVMPageBasic5::isComplete() const
+bool UIWizardNewVMPageBasic4::isComplete() const
 {
     if (!m_pDiskSkip)
@@ -297 +297 @@
 }
 
-bool UIWizardNewVMPageBasic5::validatePage()
+bool UIWizardNewVMPageBasic4::validatePage()
 {
     /* Initial result: */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic5 class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasic4 class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -39 +39 @@
 
 /** 3rd page of the New Virtual Machine wizard (base part). */
-class UIWizardNewVMPage5 : public UIWizardPageBase
+class UIWizardNewVMPage4 : public UIWizardPageBase
 {
 
@@ -45 +45 @@
 
     /** Constructor. */
-    UIWizardNewVMPage5();
+    UIWizardNewVMPage4();
 
     /** Handlers. */
@@ -94 +94 @@
 
 /** 3rd page of the New Virtual Machine wizard (basic extension). */
-class UIWizardNewVMPageBasic5 : public UIWizardPage, public UIWizardNewVMPage5
+class UIWizardNewVMPageBasic4 : public UIWizardPage, public UIWizardNewVMPage4
 {
     Q_OBJECT;
@@ -105 +105 @@
 
     /** Constructor. */
-    UIWizardNewVMPageBasic5();
+    UIWizardNewVMPageBasic4();
 
 protected:
@@ -140 +140 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h */

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

@@ -185 +185 @@
     UIWizardNewVMPage2::retranslateWidgets();
     UIWizardNewVMPage3::retranslateWidgets();
-    UIWizardNewVMPage5::retranslateWidgets();
+    UIWizardNewVMPage4::retranslateWidgets();
 
     if (m_pInstallationISOContainer)

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

@@ -26 +26 @@
 #include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVMPageBasic3.h"
-#include "UIWizardNewVMPageBasic5.h"
+#include "UIWizardNewVMPageBasic4.h"
 
 /* Forward declarations: */
@@ -37 +37 @@
                                 public UIWizardNewVMPage2,
                                 public UIWizardNewVMPage3,
-                                public UIWizardNewVMPage5
+                                public UIWizardNewVMPage4
 {