VirtualBox

Changeset 41373 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
May 21, 2012 5:41:41 PM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: Cleanup for wizards rework (r78066).

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
12 deleted
7 edited
4 copied
4 moved

Legend:

Unmodified
Added
Removed

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

    r41372 r41373  
    361361        src/wizards/UIWizardPage.h \
    362362        src/wizards/newvm/UIWizardNewVM.h \
     363        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
    363364        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
    364365        src/wizards/newvm/UIWizardNewVMPageBasic3.h \
    365         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
    366366        src/wizards/newvm/UIWizardNewVMPageExpert.h \
    367367        src/wizards/newvd/UIWizardNewVD.h \
    … …  
    392392        src/wizards/importappliance/UIWizardImportAppPageExpert.h \
    393393        src/wizards/firstrun/UIWizardFirstRun.h \
    394         src/wizards/firstrun/UIWizardFirstRunPageBasic2.h
     394        src/wizards/firstrun/UIWizardFirstRunPageBasic.h
    395395
    396396VirtualBox_QT_MOCHDRS.darwin += \
    … …  
    570570        src/wizards/UIWizardPage.cpp \
    571571        src/wizards/newvm/UIWizardNewVM.cpp \
     572        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
    572573        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
    573574        src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
    574         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
    575575        src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
    576576        src/wizards/newvd/UIWizardNewVD.cpp \
    … …  
    601601        src/wizards/importappliance/UIWizardImportAppPageExpert.cpp \
    602602        src/wizards/firstrun/UIWizardFirstRun.cpp \
    603         src/wizards/firstrun/UIWizardFirstRunPageBasic2.cpp
     603        src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
    604604
    605605VirtualBox_SOURCES.win += \

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h

    r41021 r41373  
    5454
    5555    /* Who will be able to clone virtual-machine: */
    56     friend class UIWizardCloneVMPageBasic1;
    5756    friend class UIWizardCloneVMPageBasic2;
    5857    friend class UIWizardCloneVMPageBasic3;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp

    r41372 r41373  
    2020/* Local includes: */
    2121#include "UIWizardFirstRun.h"
    22 #include "UIWizardFirstRunPageBasic2.h"
     22#include "UIWizardFirstRunPageBasic.h"
    2323#include "VBoxGlobal.h"
    2424#include "UIMessageCenter.h"
    … …  
    100100        case UIWizardMode_Basic:
    101101        {
    102             setPage(Page1, new UIWizardFirstRunPageBasic2(m_machine.GetId(), m_fHardDiskWasSet));
     102            setPage(Page, new UIWizardFirstRunPageBasic(m_machine.GetId(), m_fHardDiskWasSet));
    103103            break;
    104104        }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.h

    r41372 r41373  
    3434    enum
    3535    {
    36         Page1,
    37         Page2,
    38         Page3
    39     };
    40 
    41     /* Page IDs: */
    42     enum
    43     {
    44         PageExpert
     36        Page
    4537    };
    4638
    … …  
    5345    bool insertMedium();
    5446
    55     /* Who will be able to export appliance: */
    56     friend class UIWizardFirstRunPageBasic2;
     47    /* Who will be able to start VM: */
     48    friend class UIWizardFirstRunPageBasic;
    5749
    5850private:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

    r41372 r41373  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * UIWizardFirstRunPageBasic2 class implementation
     5 * UIWizardFirstRunPageBasic class implementation
    66 */
    77
    … …  
    2424
    2525/* Local includes: */
    26 #include "UIWizardFirstRunPageBasic2.h"
     26#include "UIWizardFirstRunPageBasic.h"
    2727#include "UIWizardFirstRun.h"
    2828#include "COMDefs.h"
    … …  
    3434#include "QIRichTextLabel.h"
    3535
    36 UIWizardFirstRunPage2::UIWizardFirstRunPage2(bool fBootHardDiskWasSet)
     36UIWizardFirstRunPage::UIWizardFirstRunPage(bool fBootHardDiskWasSet)
    3737    : m_fBootHardDiskWasSet(fBootHardDiskWasSet)
    3838{
    3939}
    4040
    41 void UIWizardFirstRunPage2::onOpenMediumWithFileOpenDialog()
     41void UIWizardFirstRunPage::onOpenMediumWithFileOpenDialog()
    4242{
    4343    /* Get opened vboxMedium id: */
    … …  
    4848}
    4949
    50 QString UIWizardFirstRunPage2::id() const
     50QString UIWizardFirstRunPage::id() const
    5151{
    5252    return m_pMediaSelector->id();
    5353}
    5454
    55 void UIWizardFirstRunPage2::setId(const QString &strId)
     55void UIWizardFirstRunPage::setId(const QString &strId)
    5656{
    5757    m_pMediaSelector->setCurrentItem(strId);
    5858}
    5959
    60 UIWizardFirstRunPageBasic2::UIWizardFirstRunPageBasic2(const QString &strMachineId, bool fBootHardDiskWasSet)
    61     : UIWizardFirstRunPage2(fBootHardDiskWasSet)
     60UIWizardFirstRunPageBasic::UIWizardFirstRunPageBasic(const QString &strMachineId, bool fBootHardDiskWasSet)
     61    : UIWizardFirstRunPage(fBootHardDiskWasSet)
    6262{
    6363    /* Create widgets: */
    … …  
    100100}
    101101
    102 void UIWizardFirstRunPageBasic2::sltOpenMediumWithFileOpenDialog()
     102void UIWizardFirstRunPageBasic::sltOpenMediumWithFileOpenDialog()
    103103{
    104104    /* Call to base-class: */
    … …  
    106106}
    107107
    108 void UIWizardFirstRunPageBasic2::retranslateUi()
     108void UIWizardFirstRunPageBasic::retranslateUi()
    109109{
    110110    /* Translate widgets: */
    … …  
    130130}
    131131
    132 void UIWizardFirstRunPageBasic2::initializePage()
     132void UIWizardFirstRunPageBasic::initializePage()
    133133{
    134134    /* Translate page: */
    … …  
    136136}
    137137
    138 bool UIWizardFirstRunPageBasic2::isComplete() const
     138bool UIWizardFirstRunPageBasic::isComplete() const
    139139{
    140140    /* Make sure valid medium chosen: */
    … …  
    142142}
    143143
    144 bool UIWizardFirstRunPageBasic2::validatePage()
     144bool UIWizardFirstRunPageBasic::validatePage()
    145145{
    146146    /* Initial result: */
    … …  
    161161}
    162162
    163 QString UIWizardFirstRunPageBasic2::source() const
     163QString UIWizardFirstRunPageBasic::source() const
    164164{
    165165    return m_pMediaSelector->currentText();

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.h

    r41372 r41373  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * UIWizardFirstRunPageBasic2 class declaration
     4 * UIWizardFirstRunPageBasic class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __UIWizardFirstRunPageBasic2_h__
    20 #define __UIWizardFirstRunPageBasic2_h__
     19#ifndef __UIWizardFirstRunPageBasic_h__
     20#define __UIWizardFirstRunPageBasic_h__
    2121
    2222/* Local includes: */
    … …  
    3030class QIRichTextLabel;
    3131
    32 /* 2nd page of the First Run wizard (base part): */
    33 class UIWizardFirstRunPage2 : public UIWizardPageBase
     32/* Single page of the First Run wizard (base part): */
     33class UIWizardFirstRunPage : public UIWizardPageBase
    3434{
    3535protected:
    3636
    3737    /* Constructor: */
    38     UIWizardFirstRunPage2(bool fBootHardDiskWasSet);
     38    UIWizardFirstRunPage(bool fBootHardDiskWasSet);
    3939
    4040    /* Handlers: */
    … …  
    5454};
    5555
    56 /* 2nd page of the First Run wizard (basic extension): */
    57 class UIWizardFirstRunPageBasic2 : public UIWizardPage, public UIWizardFirstRunPage2
     56/* Single page of the First Run wizard (basic extension): */
     57class UIWizardFirstRunPageBasic : public UIWizardPage, public UIWizardFirstRunPage
    5858{
    5959    Q_OBJECT;
    … …  
    6464
    6565    /* Constructor: */
    66     UIWizardFirstRunPageBasic2(const QString &strMachineId, bool fBootHardDiskWasSet);
     66    UIWizardFirstRunPageBasic(const QString &strMachineId, bool fBootHardDiskWasSet);
    6767
    6868protected:
    … …  
    9797};
    9898
    99 #endif // __UIWizardFirstRunPageBasic2_h__
     99#endif // __UIWizardFirstRunPageBasic_h__
    100100

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

    r41372 r41373  
    2020/* Local includes: */
    2121#include "UIWizardNewVM.h"
     22#include "UIWizardNewVMPageBasic1.h"
    2223#include "UIWizardNewVMPageBasic2.h"
    2324#include "UIWizardNewVMPageBasic3.h"
    24 #include "UIWizardNewVMPageBasic4.h"
    2525#include "UIWizardNewVMPageExpert.h"
    2626#include "VBoxDefs.h"
    … …  
    271271        case UIWizardMode_Basic:
    272272        {
    273             setPage(Page1, new UIWizardNewVMPageBasic2);
    274             setPage(Page2, new UIWizardNewVMPageBasic3);
    275             setPage(Page3, new UIWizardNewVMPageBasic4);
     273            setPage(Page1, new UIWizardNewVMPageBasic1);
     274            setPage(Page2, new UIWizardNewVMPageBasic2);
     275            setPage(Page3, new UIWizardNewVMPageBasic3);
    276276            break;
    277277        }

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

    r41372 r41373  
    3636        Page1,
    3737        Page2,
    38         Page3,
    39         Page4
     38        Page3
    4039    };
    4140
    … …  
    5554
    5655    /* Who will be able to create virtual-machine: */
    57     friend class UIWizardNewVMPageBasic4;
     56    friend class UIWizardNewVMPageBasic3;
    5857    friend class UIWizardNewVMPageExpert;
    5958

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

    r41372 r41373  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * UIWizardNewVMPageBasic2 class implementation
     5 * UIWizardNewVMPageBasic1 class implementation
    66 */
    77
    … …  
    2626
    2727/* Local includes: */
    28 #include "UIWizardNewVMPageBasic2.h"
     28#include "UIWizardNewVMPageBasic1.h"
    2929#include "UIWizardNewVM.h"
    3030#include "UIMessageCenter.h"
    … …  
    138138};
    139139
    140 UIWizardNewVMPage2::UIWizardNewVMPage2()
    141 {
    142 }
    143 
    144 void UIWizardNewVMPage2::onNameChanged(const QString &strNewName)
     140UIWizardNewVMPage1::UIWizardNewVMPage1()
     141{
     142}
     143
     144void UIWizardNewVMPage1::onNameChanged(const QString &strNewName)
    145145{
    146146    /* Search for a matching OS type based on the string the user typed already. */
    … …  
    155155}
    156156
    157 void UIWizardNewVMPage2::onOsTypeChanged()
     157void UIWizardNewVMPage1::onOsTypeChanged()
    158158{
    159159    /* If the user manually edited the OS type, we didn't want our automatic OS type guessing anymore.
    … …  
    162162}
    163163
    164 bool UIWizardNewVMPage2::machineFolderCreated()
     164bool UIWizardNewVMPage1::machineFolderCreated()
    165165{
    166166    return !m_strMachineFolder.isEmpty();
    167167}
    168168
    169 bool UIWizardNewVMPage2::createMachineFolder()
     169bool UIWizardNewVMPage1::createMachineFolder()
    170170{
    171171    /* Cleanup previosly created folder if any: */
    … …  
    208208}
    209209
    210 bool UIWizardNewVMPage2::cleanupMachineFolder()
     210bool UIWizardNewVMPage1::cleanupMachineFolder()
    211211{
    212212    /* Make sure folder was previosly created: */
    … …  
    222222}
    223223
    224 UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
     224UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1()
    225225{
    226226    /* Create widgets: */
    … …  
    266266}
    267267
    268 void UIWizardNewVMPageBasic2::sltNameChanged(const QString &strNewName)
     268void UIWizardNewVMPageBasic1::sltNameChanged(const QString &strNewName)
    269269{
    270270    /* Call to base-class: */
    … …  
    272272}
    273273
    274 void UIWizardNewVMPageBasic2::sltOsTypeChanged()
     274void UIWizardNewVMPageBasic1::sltOsTypeChanged()
    275275{
    276276    /* Call to base-class: */
    … …  
    278278}
    279279
    280 void UIWizardNewVMPageBasic2::retranslateUi()
     280void UIWizardNewVMPageBasic1::retranslateUi()
    281281{
    282282    /* Translate page: */
    … …  
    292292}
    293293
    294 void UIWizardNewVMPageBasic2::initializePage()
     294void UIWizardNewVMPageBasic1::initializePage()
    295295{
    296296    /* Translate page: */
    … …  
    301301}
    302302
    303 void UIWizardNewVMPageBasic2::cleanupPage()
     303void UIWizardNewVMPageBasic1::cleanupPage()
    304304{
    305305    /* Cleanup: */
    … …  
    309309}
    310310
    311 bool UIWizardNewVMPageBasic2::validatePage()
     311bool UIWizardNewVMPageBasic1::validatePage()
    312312{
    313313    /* Try to create machine folder: */

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

    r41361 r41373  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * UIWizardNewVMPageBasic2 class declaration
     4 * UIWizardNewVMPageBasic1 class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __UIWizardNewVMPageBasic2_h__
    20 #define __UIWizardNewVMPageBasic2_h__
     19#ifndef __UIWizardNewVMPageBasic1_h__
     20#define __UIWizardNewVMPageBasic1_h__
    2121
    2222/* Local includes: */
    … …  
    2929class QIRichTextLabel;
    3030
    31 /* 2nd page of the New Virtual Machine wizard (base part): */
    32 class UIWizardNewVMPage2 : public UIWizardPageBase
     31/* 1st page of the New Virtual Machine wizard (base part): */
     32class UIWizardNewVMPage1 : public UIWizardPageBase
    3333{
    3434protected:
    3535
    3636    /* Constructor: */
    37     UIWizardNewVMPage2();
     37    UIWizardNewVMPage1();
    3838
    3939    /* Handlers: */
    … …  
    6565};
    6666
    67 /* 2nd page of the New Virtual Machine wizard (basic extension): */
    68 class UIWizardNewVMPageBasic2 : public UIWizardPage, public UIWizardNewVMPage2
     67/* 1st page of the New Virtual Machine wizard (basic extension): */
     68class UIWizardNewVMPageBasic1 : public UIWizardPage, public UIWizardNewVMPage1
    6969{
    7070    Q_OBJECT;
    … …  
    7575
    7676    /* Constructor: */
    77     UIWizardNewVMPageBasic2();
     77    UIWizardNewVMPageBasic1();
    7878
    7979protected:
    … …  
    104104};
    105105
    106 #endif // __UIWizardNewVMPageBasic2_h__
     106#endif // __UIWizardNewVMPageBasic1_h__
    107107

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

    r41372 r41373  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * UIWizardNewVMPageBasic3 class implementation
     5 * UIWizardNewVMPageBasic2 class implementation
    66 */
    77
    … …  
    2727
    2828/* Local includes: */
    29 #include "UIWizardNewVMPageBasic3.h"
     29#include "UIWizardNewVMPageBasic2.h"
    3030#include "UIWizardNewVM.h"
    3131#include "COMDefs.h"
    … …  
    3535#include "QIRichTextLabel.h"
    3636
    37 UIWizardNewVMPage3::UIWizardNewVMPage3()
     37UIWizardNewVMPage2::UIWizardNewVMPage2()
    3838{
    3939}
    4040
    41 void UIWizardNewVMPage3::onRamSliderValueChanged(int iValue)
     41void UIWizardNewVMPage2::onRamSliderValueChanged(int iValue)
    4242{
    4343    /* Update 'ram' field editor connected to slider: */
    … …  
    4747}
    4848
    49 void UIWizardNewVMPage3::onRamEditorTextChanged(const QString &strText)
     49void UIWizardNewVMPage2::onRamEditorTextChanged(const QString &strText)
    5050{
    5151    /* Update 'ram' field slider connected to editor: */
    … …  
    5555}
    5656
    57 UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
     57UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
    5858{
    5959    /* Create widget: */
    … …  
    113113}
    114114
    115 void UIWizardNewVMPageBasic3::sltRamSliderValueChanged(int iValue)
     115void UIWizardNewVMPageBasic2::sltRamSliderValueChanged(int iValue)
    116116{
    117117    /* Call to base-class: */
    … …  
    122122}
    123123
    124 void UIWizardNewVMPageBasic3::sltRamEditorTextChanged(const QString &strText)
     124void UIWizardNewVMPageBasic2::sltRamEditorTextChanged(const QString &strText)
    125125{
    126126    /* Call to base-class: */
    … …  
    131131}
    132132
    133 void UIWizardNewVMPageBasic3::retranslateUi()
     133void UIWizardNewVMPageBasic2::retranslateUi()
    134134{
    135135    /* Translate page: */
    … …  
    149149}
    150150
    151 void UIWizardNewVMPageBasic3::initializePage()
     151void UIWizardNewVMPageBasic2::initializePage()
    152152{
    153153    /* Translate page: */
    … …  
    163163}
    164164
    165 bool UIWizardNewVMPageBasic3::isComplete() const
     165bool UIWizardNewVMPageBasic2::isComplete() const
    166166{
    167167    /* Make sure 'ram' field feats the bounds: */

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

    r41372 r41373  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * UIWizardNewVMPageBasic3 class declaration
     4 * UIWizardNewVMPageBasic2 class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __UIWizardNewVMPageBasic3_h__
    20 #define __UIWizardNewVMPageBasic3_h__
     19#ifndef __UIWizardNewVMPageBasic2_h__
     20#define __UIWizardNewVMPageBasic2_h__
    2121
    2222/* Local includes: */
    … …  
    3030class QIRichTextLabel;
    3131
    32 /* 3rd page of the New Virtual Machine wizard (base part): */
    33 class UIWizardNewVMPage3 : public UIWizardPageBase
     32/* 2nd page of the New Virtual Machine wizard (base part): */
     33class UIWizardNewVMPage2 : public UIWizardPageBase
    3434{
    3535protected:
    3636
    3737    /* Constructor: */
    38     UIWizardNewVMPage3();
     38    UIWizardNewVMPage2();
    3939
    4040    /* Handlers: */
    … …  
    5151};
    5252
    53 /* 3rd page of the New Virtual Machine wizard (basic extension): */
    54 class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
     53/* 2nd page of the New Virtual Machine wizard (basic extension): */
     54class UIWizardNewVMPageBasic2 : public UIWizardPage, public UIWizardNewVMPage2
    5555{
    5656    Q_OBJECT;
    … …  
    5959
    6060    /* Constructor: */
    61     UIWizardNewVMPageBasic3();
     61    UIWizardNewVMPageBasic2();
    6262
    6363private slots:

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

    r41372 r41373  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * UIWizardNewVMPageBasic4 class implementation
     5 * UIWizardNewVMPageBasic3 class implementation
    66 */
    77
    … …  
    2626
    2727/* Local includes: */
    28 #include "UIWizardNewVMPageBasic4.h"
     28#include "UIWizardNewVMPageBasic3.h"
    2929#include "UIWizardNewVM.h"
    3030#include "VBoxDefs.h"
    … …  
    3636#include "QIRichTextLabel.h"
    3737
    38 UIWizardNewVMPage4::UIWizardNewVMPage4()
    39 {
    40 }
    41 
    42 void UIWizardNewVMPage4::updateVirtualDiskSource()
     38UIWizardNewVMPage3::UIWizardNewVMPage3()
     39{
     40}
     41
     42void UIWizardNewVMPage3::updateVirtualDiskSource()
    4343{
    4444    /* Enable/disable controls: */
    … …  
    6363}
    6464
    65 void UIWizardNewVMPage4::getWithFileOpenDialog()
     65void UIWizardNewVMPage3::getWithFileOpenDialog()
    6666{
    6767    /* Get opened medium id: */
    … …  
    7878}
    7979
    80 bool UIWizardNewVMPage4::getWithNewVirtualDiskWizard()
     80bool UIWizardNewVMPage3::getWithNewVirtualDiskWizard()
    8181{
    8282    /* Create New Virtual Hard Drive wizard: */
    … …  
    9595}
    9696
    97 void UIWizardNewVMPage4::ensureNewVirtualDiskDeleted()
     97void UIWizardNewVMPage3::ensureNewVirtualDiskDeleted()
    9898{
    9999    /* Make sure virtual-disk exists: */
    … …  
    126126}
    127127
    128 UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     128UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
    129129{
    130130    /* Create widgets: */
    … …  
    185185}
    186186
    187 void UIWizardNewVMPageBasic4::sltVirtualDiskSourceChanged()
     187void UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged()
    188188{
    189189    /* Call to base-class: */
    … …  
    194194}
    195195
    196 void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
     196void UIWizardNewVMPageBasic3::sltGetWithFileOpenDialog()
    197197{
    198198    /* Call to base-class: */
    … …  
    200200}
    201201
    202 void UIWizardNewVMPageBasic4::retranslateUi()
     202void UIWizardNewVMPageBasic3::retranslateUi()
    203203{
    204204    /* Translate page: */
    … …  
    221221}
    222222
    223 void UIWizardNewVMPageBasic4::initializePage()
     223void UIWizardNewVMPageBasic3::initializePage()
    224224{
    225225    /* Translate page: */
    … …  
    235235}
    236236
    237 void UIWizardNewVMPageBasic4::cleanupPage()
     237void UIWizardNewVMPageBasic3::cleanupPage()
    238238{
    239239    /* Call to base-class: */
    … …  
    242242}
    243243
    244 bool UIWizardNewVMPageBasic4::isComplete() const
     244bool UIWizardNewVMPageBasic3::isComplete() const
    245245{
    246246    /* Make sure 'virtualDisk' field feats the rules: */
    … …  
    250250}
    251251
    252 bool UIWizardNewVMPageBasic4::validatePage()
     252bool UIWizardNewVMPageBasic3::validatePage()
    253253{
    254254    /* Initial result: */

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

    r41372 r41373  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * UIWizardNewVMPageBasic4 class declaration
     4 * UIWizardNewVMPageBasic3 class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __UIWizardNewVMPageBasic4_h__
    20 #define __UIWizardNewVMPageBasic4_h__
     19#ifndef __UIWizardNewVMPageBasic3_h__
     20#define __UIWizardNewVMPageBasic3_h__
    2121
    2222/* Global includes: */
    … …  
    3434class QIRichTextLabel;
    3535
    36 /* 4th page of the New Virtual Machine wizard (base part): */
    37 class UIWizardNewVMPage4 : public UIWizardPageBase
     36/* 3rd page of the New Virtual Machine wizard (base part): */
     37class UIWizardNewVMPage3 : public UIWizardPageBase
    3838{
    3939protected:
    4040
    4141    /* Constructor: */
    42     UIWizardNewVMPage4();
     42    UIWizardNewVMPage3();
    4343
    4444    /* Handlers: */
    … …  
    8080};
    8181
    82 /* 4th page of the New Virtual Machine wizard (basic extension): */
    83 class UIWizardNewVMPageBasic4 : public UIWizardPage, public UIWizardNewVMPage4
     82/* 3rd page of the New Virtual Machine wizard (basic extension): */
     83class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
    8484{
    8585    Q_OBJECT;
    … …  
    9292
    9393    /* Constructor: */
    94     UIWizardNewVMPageBasic4();
     94    UIWizardNewVMPageBasic3();
    9595
    9696protected:
    … …  
    124124};
    125125
    126 #endif // __UIWizardNewVMPageBasic4_h__
     126#endif // __UIWizardNewVMPageBasic3_h__
    127127

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

    r41372 r41373  
    2121
    2222/* Local includes: */
     23#include "UIWizardNewVMPageBasic1.h"
    2324#include "UIWizardNewVMPageBasic2.h"
    2425#include "UIWizardNewVMPageBasic3.h"
    25 #include "UIWizardNewVMPageBasic4.h"
    2626
    2727/* Expert page of the New Virtual Machine wizard: */
    2828class UIWizardNewVMPageExpert : public UIWizardPage,
     29                                public UIWizardNewVMPage1,
    2930                                public UIWizardNewVMPage2,
    30                                 public UIWizardNewVMPage3,
    31                                 public UIWizardNewVMPage4
     31                                public UIWizardNewVMPage3
    3232{
    3333    Q_OBJECT;
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