VirtualBox

Changeset 87575 in vbox


Ignore:
Timestamp:
Feb 3, 2021 3:28:38 PM (4 years ago)
Author:
vboxsync
Message:

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

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r87571 r87575  
    655655        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
    656656        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
    657         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
     657        src/wizards/newvm/UIWizardNewVMPageBasic3.h \
    658658        src/wizards/newvm/UIWizardNewVMPageBasic5.h \
    659659        src/wizards/newvm/UIWizardNewVMPageExpert.h \
    … …  
    11371137        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
    11381138        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
    1139         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
     1139        src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
    11401140        src/wizards/newvm/UIWizardNewVMPageBasic5.cpp \
    11411141        src/wizards/newvm/UIWizardNewVMPageExpert.cpp \

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

    r87571 r87575  
    2525#include "UIWizardNewVMPageBasic1.h"
    2626#include "UIWizardNewVMPageBasic2.h"
    27 #include "UIWizardNewVMPageBasic4.h"
     27#include "UIWizardNewVMPageBasic3.h"
    2828#include "UIWizardNewVMPageBasic5.h"
    2929#include "UIWizardNewVMPageExpert.h"
    … …  
    8282            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
    8383            setPage(Page2, new UIWizardNewVMPageBasic2);
    84             setPage(Page4, new UIWizardNewVMPageBasic4);
     84            setPage(Page3, new UIWizardNewVMPageBasic3);
    8585            setPage(Page5, new UIWizardNewVMPageBasic5);
    8686            setStartId(Page1);

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

    r87571 r87575  
    6262        Page1,
    6363        Page2,
    64         Page4,
     64        Page3,
    6565        Page5,
    6666        PageMax

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

    r87571 r87575  
    497497    if (isUnattendedEnabled())
    498498        return UIWizardNewVM::Page2;
    499     return UIWizardNewVM::Page4;
     499    return UIWizardNewVM::Page3;
    500500}
    501501

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

    r87574 r87575  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic4 class implementation.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic3 class implementation.
    44 */
    55
    … …  
    3434#include "UIWizardNewVD.h"
    3535#include "UIWizardNewVM.h"
    36 #include "UIWizardNewVMPageBasic4.h"
     36#include "UIWizardNewVMPageBasic3.h"
    3737
    38 UIWizardNewVMPage4::UIWizardNewVMPage4()
     38UIWizardNewVMPage3::UIWizardNewVMPage3()
    3939    : m_pBaseMemoryEditor(0)
    4040    , m_pVirtualCPUEditor(0)
    … …  
    4242}
    4343
    44 int UIWizardNewVMPage4::baseMemory() const
     44int UIWizardNewVMPage3::baseMemory() const
    4545{
    4646    if (!m_pBaseMemoryEditor)
    … …  
    4949}
    5050
    51 int UIWizardNewVMPage4::VCPUCount() const
     51int UIWizardNewVMPage3::VCPUCount() const
    5252{
    5353    if (!m_pVirtualCPUEditor)
    … …  
    5656}
    5757
    58 void UIWizardNewVMPage4::retranslateWidgets()
     58void UIWizardNewVMPage3::retranslateWidgets()
    5959{
    6060}
    6161
    62 QWidget *UIWizardNewVMPage4::createHardwareWidgets()
     62QWidget *UIWizardNewVMPage3::createHardwareWidgets()
    6363{
    6464    QWidget *pHardwareContainer = new QWidget;
    … …  
    7272}
    7373
    74 UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     74UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
    7575    : m_pLabel(0)
    7676{
    … …  
    8181}
    8282
    83 void UIWizardNewVMPageBasic4::prepare()
     83void UIWizardNewVMPageBasic3::prepare()
    8484{
    8585    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    9393}
    9494
    95 void UIWizardNewVMPageBasic4::createConnections()
     95void UIWizardNewVMPageBasic3::createConnections()
    9696{
    9797
    … …  
    9999
    100100
    101 void UIWizardNewVMPageBasic4::retranslateUi()
     101void UIWizardNewVMPageBasic3::retranslateUi()
    102102{
    103103    setTitle(UIWizardNewVM::tr("Hardware"));
    … …  
    110110}
    111111
    112 void UIWizardNewVMPageBasic4::initializePage()
     112void UIWizardNewVMPageBasic3::initializePage()
    113113{
    114114    retranslateUi();
    … …  
    124124}
    125125
    126 void UIWizardNewVMPageBasic4::cleanupPage()
     126void UIWizardNewVMPageBasic3::cleanupPage()
    127127{
    128128    UIWizardPage::cleanupPage();
    129129}
    130130
    131 bool UIWizardNewVMPageBasic4::isComplete() const
     131bool UIWizardNewVMPageBasic3::isComplete() const
    132132{
    133133    return true;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h

    r87574 r87575  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic4 class declaration.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic3 class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    4141
    4242/** 3rd page of the New Virtual Machine wizard (base part). */
    43 class UIWizardNewVMPage4 : public UIWizardPageBase
     43class UIWizardNewVMPage3 : public UIWizardPageBase
    4444{
    4545
    … …  
    4747
    4848    /** Constructor. */
    49     UIWizardNewVMPage4();
     49    UIWizardNewVMPage3();
    5050
    5151
    … …  
    7070
    7171/** 3rd page of the New Virtual Machine wizard (basic extension). */
    72 class UIWizardNewVMPageBasic4 : public UIWizardPage, public UIWizardNewVMPage4
     72class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
    7373{
    7474    Q_OBJECT;
    … …  
    7979
    8080    /** Constructor. */
    81     UIWizardNewVMPageBasic4();
     81    UIWizardNewVMPageBasic3();
    8282
    8383protected:
    … …  
    109109};
    110110
    111 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h */
     111#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */

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

    r87571 r87575  
    184184    UIWizardNewVMPage1::retranslateWidgets();
    185185    UIWizardNewVMPage2::retranslateWidgets();
    186     UIWizardNewVMPage4::retranslateWidgets();
     186    UIWizardNewVMPage3::retranslateWidgets();
    187187    UIWizardNewVMPage5::retranslateWidgets();
    188188

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

    r87571 r87575  
    2525#include "UIWizardNewVMPageBasic1.h"
    2626#include "UIWizardNewVMPageBasic2.h"
    27 #include "UIWizardNewVMPageBasic4.h"
     27#include "UIWizardNewVMPageBasic3.h"
    2828#include "UIWizardNewVMPageBasic5.h"
    2929
    … …  
    3636                                public UIWizardNewVMPage1,
    3737                                public UIWizardNewVMPage2,
    38                                 public UIWizardNewVMPage4,
     38                                public UIWizardNewVMPage3,
    3939                                public UIWizardNewVMPage5
    4040{
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette