VirtualBox

Changeset 91059 in vbox


Ignore:
Timestamp:
Sep 1, 2021 1:48:12 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Renaming newvm classes.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
4 edited
10 moved

Legend:

Unmodified
Added
Removed

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

    r91057 r91059  
    660660        src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \
    661661        src/wizards/newvm/UIWizardNewVM.h \
    662         src/wizards/newvm/UIWizardNewVMNameOSTypePageBasic.h \
    663         src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.h \
    664         src/wizards/newvm/UIWizardNewVMHardwarePageBasic.h \
    665         src/wizards/newvm/UIWizardNewVMDiskPageBasic.h \
    666         src/wizards/newvm/UIWizardNewVMPageExpert.h \
     662        src/wizards/newvm/UIWizardNewVMNameOSTypePage.h \
     663        src/wizards/newvm/UIWizardNewVMUnattendedPage.h \
     664        src/wizards/newvm/UIWizardNewVMHardwarePage.h \
     665        src/wizards/newvm/UIWizardNewVMDiskPage.h \
     666        src/wizards/newvm/UIWizardNewVMExpertPage.h \
    667667        src/wizards/clonevm/UIWizardCloneVM.h \
    668668        src/wizards/clonevm/UIWizardCloneVMNamePathPageBasic.h \
    … …  
    11681168        src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \
    11691169        src/wizards/newvm/UIWizardNewVM.cpp \
    1170         src/wizards/newvm/UIWizardNewVMNameOSTypePageBasic.cpp \
    1171         src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp \
    1172         src/wizards/newvm/UIWizardNewVMHardwarePageBasic.cpp \
    1173         src/wizards/newvm/UIWizardNewVMDiskPageBasic.cpp \
    1174         src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
     1170        src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp \
     1171        src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp \
     1172        src/wizards/newvm/UIWizardNewVMHardwarePage.cpp \
     1173        src/wizards/newvm/UIWizardNewVMDiskPage.cpp \
     1174        src/wizards/newvm/UIWizardNewVMExpertPage.cpp \
    11751175        src/wizards/clonevm/UIWizardCloneVM.cpp \
    11761176        src/wizards/clonevm/UIWizardCloneVMNamePathPageBasic.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

    r90886 r91059  
    3838#include "UIWizardDiskEditors.h"
    3939#include "UIWizardNewVM.h"
    40 #include "UIWizardNewVMDiskPageBasic.h"
     40#include "UIWizardNewVMDiskPage.h"
    4141
    4242/* Other VBox includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp

    r90328 r91059  
    3131#include "UIWizardNewVM.h"
    3232#include "UIWizardNewVMEditors.h"
    33 #include "UIWizardNewVMUnattendedPageBasic.h"
     33#include "UIWizardNewVMUnattendedPage.h"
    3434
    3535/* Other VBox includes: */
    … …  
    181181void UIGAInstallationGroupBox::mark()
    182182{
    183     bool fError = !UIWizardNewVMUnattendedPage::checkGAISOFile(path());
     183    bool fError = !UIWizardNewVMUnattendedCommon::checkGAISOFile(path());
    184184    if (m_pGAISOFilePathSelector)
    185185        m_pGAISOFilePathSelector->mark(fError, tr("Invalid Guest Additions installation media"));
    … …  
    190190    if (!isChecked())
    191191        return true;
    192     return UIWizardNewVMUnattendedPage::checkGAISOFile(path());
     192    return UIWizardNewVMUnattendedCommon::checkGAISOFile(path());
    193193}
    194194

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

    r91031 r91059  
    2424#include "UIProgressObject.h"
    2525#include "UIWizardNewVM.h"
    26 #include "UIWizardNewVMNameOSTypePageBasic.h"
    27 #include "UIWizardNewVMUnattendedPageBasic.h"
    28 #include "UIWizardNewVMHardwarePageBasic.h"
    29 #include "UIWizardNewVMDiskPageBasic.h"
    30 #include "UIWizardNewVMPageExpert.h"
     26#include "UIWizardNewVMNameOSTypePage.h"
     27#include "UIWizardNewVMUnattendedPage.h"
     28#include "UIWizardNewVMHardwarePage.h"
     29#include "UIWizardNewVMDiskPage.h"
     30#include "UIWizardNewVMExpertPage.h"
    3131#include "UIMessageCenter.h"
    3232#include "UIMedium.h"
    … …  
    8989        case WizardMode_Basic:
    9090        {
    91             addPage(new UIWizardNewVMNameOSTypePageBasic);
    92             m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPageBasic);
     91            addPage(new UIWizardNewVMNameOSTypePage);
     92            m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPage);
    9393            setUnattendedPageVisible(false);
    94             addPage(new UIWizardNewVMHardwarePageBasic);
    95             addPage(new UIWizardNewVMDiskPageBasic);
     94            addPage(new UIWizardNewVMHardwarePage);
     95            addPage(new UIWizardNewVMDiskPage);
    9696            break;
    9797        }
    9898        case WizardMode_Expert:
    9999        {
    100             addPage(new UIWizardNewVMPageExpert);
     100            addPage(new UIWizardNewVMExpertPage);
    101101            break;
    102102        }
    … …  
    111111void UIWizardNewVM::wizardClean()
    112112{
    113     UIWizardNewVMNameOSTypePage::cleanupMachineFolder(this, true);
     113    UIWizardNewVMNameOSTypeCommon::cleanupMachineFolder(this, true);
    114114}
    115115
    … …  
    546546void UIWizardNewVM::sltHandleWizardCancel()
    547547{
    548     UIWizardNewVMNameOSTypePage::cleanupMachineFolder(this, true);
     548    UIWizardNewVMNameOSTypeCommon::cleanupMachineFolder(this, true);
    549549}
    550550

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMDiskPageBasic class implementation.
     3 * VBox Qt GUI - UIWizardNewVMDiskPage class implementation.
    44 */
    55
    … …  
    3232#include "UIMessageCenter.h"
    3333#include "UICommon.h"
    34 #include "UIWizardNewVMDiskPageBasic.h"
     34#include "UIWizardNewVMDiskPage.h"
    3535#include "UIWizardDiskEditors.h"
    3636#include "UIWizardNewVM.h"
    … …  
    4141#include "CSystemProperties.h"
    4242
    43 QUuid UIWizardNewVMDiskPage::getWithFileOpenDialog(const QString &strOSTypeID,
    44                                                    const QString &strMachineFolder,
    45                                                    const QString &strMachineBaseName,
    46                                                    QWidget *pCaller)
     43QUuid UIWizardNewVMDiskCommon::getWithFileOpenDialog(const QString &strOSTypeID,
     44                                                     const QString &strMachineFolder,
     45                                                     const QString &strMachineBaseName,
     46                                                     QWidget *pCaller)
    4747{
    4848    QUuid uMediumId;
    … …  
    5858}
    5959
    60 UIWizardNewVMDiskPageBasic::UIWizardNewVMDiskPageBasic()
     60UIWizardNewVMDiskPage::UIWizardNewVMDiskPage()
    6161    : m_pDiskSourceButtonGroup(0)
    6262    , m_pDiskEmpty(0)
    … …  
    8282
    8383
    84 void UIWizardNewVMDiskPageBasic::prepare()
     84void UIWizardNewVMDiskPage::prepare()
    8585{
    8686    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    9797}
    9898
    99 QWidget *UIWizardNewVMDiskPageBasic::createNewDiskWidgets()
     99QWidget *UIWizardNewVMDiskPage::createNewDiskWidgets()
    100100{
    101101    QWidget *pWidget = new QWidget;
    … …  
    137137}
    138138
    139 void UIWizardNewVMDiskPageBasic::createConnections()
     139void UIWizardNewVMDiskPage::createConnections()
    140140{
    141141    if (m_pDiskSourceButtonGroup)
    142142        connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
    143                 this, &UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged);
     143                this, &UIWizardNewVMDiskPage::sltSelectedDiskSourceChanged);
    144144    if (m_pDiskSelector)
    145145        connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
    146                 this, &UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged);
     146                this, &UIWizardNewVMDiskPage::sltMediaComboBoxIndexChanged);
    147147    if (m_pDiskSelectionButton)
    148148        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
    149                 this, &UIWizardNewVMDiskPageBasic::sltGetWithFileOpenDialog);
     149                this, &UIWizardNewVMDiskPage::sltGetWithFileOpenDialog);
    150150    if (m_pMediumSizeEditor)
    151151        connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
    152                 this, &UIWizardNewVMDiskPageBasic::sltHandleSizeEditorChange);
     152                this, &UIWizardNewVMDiskPage::sltHandleSizeEditorChange);
    153153    if (m_pFixedCheckBox)
    154154        connect(m_pFixedCheckBox, &QCheckBox::toggled,
    155                 this, &UIWizardNewVMDiskPageBasic::sltFixedCheckBoxToggled);
    156 }
    157 
    158 void UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged()
     155                this, &UIWizardNewVMDiskPage::sltFixedCheckBoxToggled);
     156}
     157
     158void UIWizardNewVMDiskPage::sltSelectedDiskSourceChanged()
    159159{
    160160    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    177177}
    178178
    179 void UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged()
     179void UIWizardNewVMDiskPage::sltMediaComboBoxIndexChanged()
    180180{
    181181    AssertReturnVoid(m_pDiskSelector && wizardWindow<UIWizardNewVM>());
    … …  
    185185}
    186186
    187 void UIWizardNewVMDiskPageBasic::sltGetWithFileOpenDialog()
     187void UIWizardNewVMDiskPage::sltGetWithFileOpenDialog()
    188188{
    189189    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    191191    const CGuestOSType &comOSType = pWizard->guestOSType();
    192192    AssertReturnVoid(!comOSType.isNull());
    193     QUuid uMediumId = UIWizardNewVMDiskPage::getWithFileOpenDialog(comOSType.GetId(),
    194                                                                    pWizard->machineFolder(),
    195                                                                    pWizard->machineBaseName(),
    196                                                                    this);
     193    QUuid uMediumId = UIWizardNewVMDiskCommon::getWithFileOpenDialog(comOSType.GetId(),
     194                                                                     pWizard->machineFolder(),
     195                                                                     pWizard->machineBaseName(),
     196                                                                     this);
    197197    if (!uMediumId.isNull())
    198198    {
    … …  
    202202}
    203203
    204 void UIWizardNewVMDiskPageBasic::retranslateUi()
     204void UIWizardNewVMDiskPage::retranslateUi()
    205205{
    206206    setTitle(UIWizardNewVM::tr("Virtual Hard disk"));
    … …  
    243243}
    244244
    245 void UIWizardNewVMDiskPageBasic::initializePage()
     245void UIWizardNewVMDiskPage::initializePage()
    246246{
    247247    retranslateUi();
    … …  
    333333}
    334334
    335 bool UIWizardNewVMDiskPageBasic::isComplete() const
     335bool UIWizardNewVMDiskPage::isComplete() const
    336336{
    337337    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    348348}
    349349
    350 bool UIWizardNewVMDiskPageBasic::validatePage()
     350bool UIWizardNewVMDiskPage::validatePage()
    351351{
    352352    bool fResult = true;
    … …  
    405405}
    406406
    407 void UIWizardNewVMDiskPageBasic::sltHandleSizeEditorChange(qulonglong uSize)
     407void UIWizardNewVMDiskPage::sltHandleSizeEditorChange(qulonglong uSize)
    408408{
    409409    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    413413}
    414414
    415 void UIWizardNewVMDiskPageBasic::sltFixedCheckBoxToggled(bool fChecked)
     415void UIWizardNewVMDiskPage::sltFixedCheckBoxToggled(bool fChecked)
    416416{
    417417    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    425425}
    426426
    427 void UIWizardNewVMDiskPageBasic::setEnableNewDiskWidgets(bool fEnable)
     427void UIWizardNewVMDiskPage::setEnableNewDiskWidgets(bool fEnable)
    428428{
    429429    if (m_pMediumSizeEditor)
    … …  
    435435}
    436436
    437 QWidget *UIWizardNewVMDiskPageBasic::createDiskWidgets()
     437QWidget *UIWizardNewVMDiskPage::createDiskWidgets()
    438438{
    439439    QWidget *pDiskContainer = new QWidget;
    … …  
    470470}
    471471
    472 QWidget *UIWizardNewVMDiskPageBasic::createMediumVariantWidgets(bool fWithLabels)
     472QWidget *UIWizardNewVMDiskPage::createMediumVariantWidgets(bool fWithLabels)
    473473{
    474474    QWidget *pContainerWidget = new QWidget;
    … …  
    499499}
    500500
    501 void UIWizardNewVMDiskPageBasic::setEnableDiskSelectionWidgets(bool fEnabled)
     501void UIWizardNewVMDiskPage::setEnableDiskSelectionWidgets(bool fEnabled)
    502502{
    503503    if (!m_pDiskSelector || !m_pDiskSelectionButton)
    … …  
    508508}
    509509
    510 void UIWizardNewVMDiskPageBasic::setWidgetVisibility(const CMediumFormat &mediumFormat)
     510void UIWizardNewVMDiskPage::setWidgetVisibility(const CMediumFormat &mediumFormat)
    511511{
    512512    ULONG uCapabilities = 0;

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMDiskPageBasic class declaration.
     3 * VBox Qt GUI - UIWizardNewVMDiskPage class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPageBasic_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPageBasic_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPage_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPage_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    5151};
    5252
    53 namespace UIWizardNewVMDiskPage
     53namespace UIWizardNewVMDiskCommon
    5454{
    5555    QUuid getWithFileOpenDialog(const QString &strOSTypeID,
    … …  
    6060
    6161
    62 class UIWizardNewVMDiskPageBasic : public UINativeWizardPage
     62class UIWizardNewVMDiskPage : public UINativeWizardPage
    6363{
    6464    Q_OBJECT;
    … …  
    6666public:
    6767
    68     UIWizardNewVMDiskPageBasic();
     68    UIWizardNewVMDiskPage();
    6969
    7070protected:
    … …  
    124124};
    125125
    126 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPageBasic_h */
     126#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMDiskPage_h */

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageExpert class implementation.
     3 * VBox Qt GUI - UIWizardNewVMExpertPage class implementation.
    44 */
    55
    … …  
    3434#include "UIWizardDiskEditors.h"
    3535#include "UIWizardNewVMEditors.h"
    36 #include "UIWizardNewVMPageExpert.h"
    37 #include "UIWizardNewVMNameOSTypePageBasic.h"
     36#include "UIWizardNewVMExpertPage.h"
     37#include "UIWizardNewVMNameOSTypePage.h"
    3838
    3939/* COM includes: */
    4040#include "CSystemProperties.h"
    4141
    42 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert()
     42UIWizardNewVMExpertPage::UIWizardNewVMExpertPage()
    4343    : m_pToolBox(0)
    4444    , m_pDiskVariantGroupBox(0)
    … …  
    8282}
    8383
    84 void UIWizardNewVMPageExpert::sltNameChanged(const QString &strNewName)
     84void UIWizardNewVMExpertPage::sltNameChanged(const QString &strNewName)
    8585{
    8686    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    8888    {
    8989        m_pNameAndSystemEditor->blockSignals(true);
    90         if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
     90        if (UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
    9191        {
    9292            wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    … …  
    9696        m_pNameAndSystemEditor->blockSignals(false);
    9797    }
    98     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
     98    UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    9999    if (!m_userModifiedParameters.contains("MediumPath"))
    100100        updateVirtualMediumPathFromMachinePathName();
    … …  
    104104}
    105105
    106 void UIWizardNewVMPageExpert::sltPathChanged(const QString &strNewPath)
     106void UIWizardNewVMExpertPage::sltPathChanged(const QString &strNewPath)
    107107{
    108108    Q_UNUSED(strNewPath);
    109     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
     109    UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    110110    if (!m_userModifiedParameters.contains("MediumPath"))
    111111        updateVirtualMediumPathFromMachinePathName();
    112112}
    113113
    114 void UIWizardNewVMPageExpert::sltOsTypeChanged()
     114void UIWizardNewVMExpertPage::sltOsTypeChanged()
    115115{
    116116    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    121121}
    122122
    123 void UIWizardNewVMPageExpert::sltGetWithFileOpenDialog()
     123void UIWizardNewVMExpertPage::sltGetWithFileOpenDialog()
    124124{
    125125    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    127127    const CGuestOSType &comOSType = pWizard->guestOSType();
    128128    AssertReturnVoid(!comOSType.isNull());
    129     QUuid uMediumId = UIWizardNewVMDiskPage::getWithFileOpenDialog(comOSType.GetId(),
    130                                                                    pWizard->machineFolder(),
    131                                                                    pWizard->machineBaseName(),
    132                                                                    this);
     129    QUuid uMediumId = UIWizardNewVMDiskCommon::getWithFileOpenDialog(comOSType.GetId(),
     130                                                                     pWizard->machineFolder(),
     131                                                                     pWizard->machineBaseName(),
     132                                                                     this);
    133133    if (!uMediumId.isNull())
    134134    {
    … …  
    138138}
    139139
    140 void UIWizardNewVMPageExpert::sltISOPathChanged(const QString &strISOPath)
     140void UIWizardNewVMExpertPage::sltISOPathChanged(const QString &strISOPath)
    141141{
    142142    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    143143    AssertReturnVoid(pWizard);
    144144
    145     UIWizardNewVMNameOSTypePage::determineOSType(strISOPath, pWizard);
     145    UIWizardNewVMNameOSTypeCommon::determineOSType(strISOPath, pWizard);
    146146
    147147    if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
    148             UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     148            UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
    149149    pWizard->setISOFilePath(strISOPath);
    150150
    … …  
    158158}
    159159
    160 void UIWizardNewVMPageExpert::sltGAISOPathChanged(const QString &strPath)
     160void UIWizardNewVMExpertPage::sltGAISOPathChanged(const QString &strPath)
    161161{
    162162    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    166166}
    167167
    168 void UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle(bool fEnabled)
     168void UIWizardNewVMExpertPage::sltInstallGACheckBoxToggle(bool fEnabled)
    169169{
    170170    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    174174}
    175175
    176 void UIWizardNewVMPageExpert::sltOSFamilyTypeChanged(const QString &strGuestOSFamilyType)
     176void UIWizardNewVMExpertPage::sltOSFamilyTypeChanged(const QString &strGuestOSFamilyType)
    177177{
    178178    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    183183}
    184184
    185 void UIWizardNewVMPageExpert::retranslateUi()
     185void UIWizardNewVMExpertPage::retranslateUi()
    186186{
    187187    if (m_pSkipUnattendedCheckBox)
    … …  
    214214}
    215215
    216 void UIWizardNewVMPageExpert::createConnections()
     216void UIWizardNewVMExpertPage::createConnections()
    217217{
    218218    /* Connections for Name, OS Type, and unattended install stuff: */
    … …  
    220220    {
    221221        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged,
    222                 this, &UIWizardNewVMPageExpert::sltNameChanged);
     222                this, &UIWizardNewVMExpertPage::sltNameChanged);
    223223        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged,
    224                 this, &UIWizardNewVMPageExpert::sltPathChanged);
     224                this, &UIWizardNewVMExpertPage::sltPathChanged);
    225225        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged,
    226                 this, &UIWizardNewVMPageExpert::sltOsTypeChanged);
     226                this, &UIWizardNewVMExpertPage::sltOsTypeChanged);
    227227        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged,
    228                 this, &UIWizardNewVMPageExpert::sltOSFamilyTypeChanged);
     228                this, &UIWizardNewVMExpertPage::sltOSFamilyTypeChanged);
    229229        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged,
    230                 this, &UIWizardNewVMPageExpert::sltISOPathChanged);
     230                this, &UIWizardNewVMExpertPage::sltISOPathChanged);
    231231    }
    232232
    … …  
    234234    {
    235235        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigMemorySizeChanged,
    236                 this, &UIWizardNewVMPageExpert::sltMemorySizeChanged);
     236                this, &UIWizardNewVMExpertPage::sltMemorySizeChanged);
    237237        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigCPUCountChanged,
    238                 this, &UIWizardNewVMPageExpert::sltCPUCountChanged);
     238                this, &UIWizardNewVMExpertPage::sltCPUCountChanged);
    239239        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigEFIEnabledChanged,
    240                 this, &UIWizardNewVMPageExpert::sltEFIEnabledChanged);
     240                this, &UIWizardNewVMExpertPage::sltEFIEnabledChanged);
    241241    }
    242242    /* Connections for username, password, and hostname, etc: */
    … …  
    244244    {
    245245        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::sigPathChanged,
    246                 this, &UIWizardNewVMPageExpert::sltGAISOPathChanged);
     246                this, &UIWizardNewVMExpertPage::sltGAISOPathChanged);
    247247        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::toggled,
    248                 this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
     248                this, &UIWizardNewVMExpertPage::sltInstallGACheckBoxToggle);
    249249    }
    250250
    … …  
    252252    {
    253253        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigPasswordChanged,
    254                 this, &UIWizardNewVMPageExpert::sltPasswordChanged);
     254                this, &UIWizardNewVMExpertPage::sltPasswordChanged);
    255255        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigUserNameChanged,
    256                 this, &UIWizardNewVMPageExpert::sltUserNameChanged);
     256                this, &UIWizardNewVMExpertPage::sltUserNameChanged);
    257257    }
    258258
    … …  
    260260    {
    261261        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigHostnameDomainNameChanged,
    262                 this, &UIWizardNewVMPageExpert::sltHostnameDomainNameChanged);
     262                this, &UIWizardNewVMExpertPage::sltHostnameDomainNameChanged);
    263263        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigProductKeyChanged,
    264                 this, &UIWizardNewVMPageExpert::sltProductKeyChanged);
     264                this, &UIWizardNewVMExpertPage::sltProductKeyChanged);
    265265        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged,
    266                 this, &UIWizardNewVMPageExpert::sltStartHeadlessChanged);
     266                this, &UIWizardNewVMExpertPage::sltStartHeadlessChanged);
    267267    }
    268268
    … …  
    270270    if (m_pDiskSourceButtonGroup)
    271271        connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
    272                 this, &UIWizardNewVMPageExpert::sltSelectedDiskSourceChanged);
     272                this, &UIWizardNewVMExpertPage::sltSelectedDiskSourceChanged);
    273273
    274274    if (m_pSkipUnattendedCheckBox)
    275275        connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled,
    276         this, &UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked);
     276        this, &UIWizardNewVMExpertPage::sltSkipUnattendedCheckBoxChecked);
    277277
    278278    if (m_pSizeAndLocationGroup)
    279279    {
    280280        connect(m_pSizeAndLocationGroup, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
    281                 this, &UIWizardNewVMPageExpert::sltMediumSizeChanged);
     281                this, &UIWizardNewVMExpertPage::sltMediumSizeChanged);
    282282        connect(m_pSizeAndLocationGroup, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
    283                 this, &UIWizardNewVMPageExpert::sltMediumPathChanged);
     283                this, &UIWizardNewVMExpertPage::sltMediumPathChanged);
    284284        connect(m_pSizeAndLocationGroup, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
    285                 this, &UIWizardNewVMPageExpert::sltMediumLocationButtonClicked);
     285                this, &UIWizardNewVMExpertPage::sltMediumLocationButtonClicked);
    286286    }
    287287
    288288    if (m_pDiskSelectionButton)
    289289        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
    290                 this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
     290                this, &UIWizardNewVMExpertPage::sltGetWithFileOpenDialog);
    291291
    292292    if (m_pDiskSelector)
    293293        connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
    294                 this, &UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged);
     294                this, &UIWizardNewVMExpertPage::sltMediaComboBoxIndexChanged);
    295295
    296296    connect(m_pFormatButtonGroup, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
    297             this, &UIWizardNewVMPageExpert::sltMediumFormatChanged);
     297            this, &UIWizardNewVMExpertPage::sltMediumFormatChanged);
    298298
    299299    connect(m_pDiskVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
    300             this, &UIWizardNewVMPageExpert::sltMediumVariantChanged);
    301 }
    302 
    303 void UIWizardNewVMPageExpert::setOSTypeDependedValues()
     300            this, &UIWizardNewVMExpertPage::sltMediumVariantChanged);
     301}
     302
     303void UIWizardNewVMExpertPage::setOSTypeDependedValues()
    304304{
    305305    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    356356}
    357357
    358 void UIWizardNewVMPageExpert::initializePage()
     358void UIWizardNewVMExpertPage::initializePage()
    359359{
    360360    /* We need not to check existence of parameter within m_userModifiedParameters since initializePage() runs
    … …  
    402402}
    403403
    404 void UIWizardNewVMPageExpert::markWidgets() const
     404void UIWizardNewVMExpertPage::markWidgets() const
    405405{
    406406    if (m_pNameAndSystemEditor)
    407407    {
    408408        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty());
    409         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor),
     409        m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
    410410                                                UIWizardNewVM::tr("Invalid file path or unreadable file"));
    411411    }
    … …  
    417417}
    418418
    419 QWidget *UIWizardNewVMPageExpert::createUnattendedWidgets()
     419QWidget *UIWizardNewVMExpertPage::createUnattendedWidgets()
    420420{
    421421    QWidget *pContainerWidget = new QWidget;
    … …  
    441441}
    442442
    443 QWidget *UIWizardNewVMPageExpert::createNewDiskWidgets()
     443QWidget *UIWizardNewVMExpertPage::createNewDiskWidgets()
    444444{
    445445    QWidget *pNewDiskContainerWidget = new QWidget;
    … …  
    456456}
    457457
    458 QWidget *UIWizardNewVMPageExpert::createDiskWidgets()
     458QWidget *UIWizardNewVMExpertPage::createDiskWidgets()
    459459{
    460460    QWidget *pDiskContainer = new QWidget;
    … …  
    491491}
    492492
    493 bool UIWizardNewVMPageExpert::isComplete() const
     493bool UIWizardNewVMExpertPage::isComplete() const
    494494{
    495495    markWidgets();
    … …  
    507507    {
    508508        /* Check the installation medium: */
    509         if (!UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor))
     509        if (!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor))
    510510        {
    511511            m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
    … …  
    554554            fIsComplete = false;
    555555        }
    556         if (!UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor))
     556        if (!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor))
    557557        {
    558558            m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
    … …  
    583583}
    584584
    585 bool UIWizardNewVMPageExpert::validatePage()
     585bool UIWizardNewVMExpertPage::validatePage()
    586586{
    587587    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    627627}
    628628
    629 bool UIWizardNewVMPageExpert::isProductKeyWidgetEnabled() const
     629bool UIWizardNewVMExpertPage::isProductKeyWidgetEnabled() const
    630630{
    631631    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    635635}
    636636
    637 void UIWizardNewVMPageExpert::disableEnableUnattendedRelatedWidgets(bool fEnabled)
     637void UIWizardNewVMExpertPage::disableEnableUnattendedRelatedWidgets(bool fEnabled)
    638638{
    639639    if (m_pUserNamePasswordGroupBox)
    … …  
    646646}
    647647
    648 void UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked(bool fSkip)
     648void UIWizardNewVMExpertPage::sltSkipUnattendedCheckBoxChecked(bool fSkip)
    649649{
    650650    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    655655}
    656656
    657 void UIWizardNewVMPageExpert::sltMediumFormatChanged()
     657void UIWizardNewVMExpertPage::sltMediumFormatChanged()
    658658{
    659659    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    667667}
    668668
    669 void UIWizardNewVMPageExpert::sltMediumSizeChanged(qulonglong uSize)
     669void UIWizardNewVMExpertPage::sltMediumSizeChanged(qulonglong uSize)
    670670{
    671671    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    675675}
    676676
    677 void UIWizardNewVMPageExpert::sltMediumPathChanged(const QString &strPath)
     677void UIWizardNewVMExpertPage::sltMediumPathChanged(const QString &strPath)
    678678{
    679679    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    683683}
    684684
    685 void UIWizardNewVMPageExpert::sltMediumLocationButtonClicked()
     685void UIWizardNewVMExpertPage::sltMediumLocationButtonClicked()
    686686{
    687687    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    699699}
    700700
    701 void UIWizardNewVMPageExpert::sltMediumVariantChanged(qulonglong uVariant)
     701void UIWizardNewVMExpertPage::sltMediumVariantChanged(qulonglong uVariant)
    702702{
    703703    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    706706}
    707707
    708 void UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged()
     708void UIWizardNewVMExpertPage::sltMediaComboBoxIndexChanged()
    709709{
    710710    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    715715}
    716716
    717 void UIWizardNewVMPageExpert::sltSelectedDiskSourceChanged()
     717void UIWizardNewVMExpertPage::sltSelectedDiskSourceChanged()
    718718{
    719719    AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
    … …  
    736736}
    737737
    738 void UIWizardNewVMPageExpert::sltMemorySizeChanged(int iValue)
     738void UIWizardNewVMExpertPage::sltMemorySizeChanged(int iValue)
    739739{
    740740    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    743743}
    744744
    745 void UIWizardNewVMPageExpert::sltCPUCountChanged(int iCount)
     745void UIWizardNewVMExpertPage::sltCPUCountChanged(int iCount)
    746746{
    747747    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    749749}
    750750
    751 void UIWizardNewVMPageExpert::sltEFIEnabledChanged(bool fEnabled)
     751void UIWizardNewVMExpertPage::sltEFIEnabledChanged(bool fEnabled)
    752752{
    753753    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    756756}
    757757
    758 void UIWizardNewVMPageExpert::sltPasswordChanged(const QString &strPassword)
     758void UIWizardNewVMExpertPage::sltPasswordChanged(const QString &strPassword)
    759759{
    760760    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    764764}
    765765
    766 void UIWizardNewVMPageExpert::sltUserNameChanged(const QString &strUserName)
     766void UIWizardNewVMExpertPage::sltUserNameChanged(const QString &strUserName)
    767767{
    768768    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    772772}
    773773
    774 void UIWizardNewVMPageExpert::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
     774void UIWizardNewVMExpertPage::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
    775775{
    776776    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    780780}
    781781
    782 void UIWizardNewVMPageExpert::sltProductKeyChanged(const QString &strProductKey)
     782void UIWizardNewVMExpertPage::sltProductKeyChanged(const QString &strProductKey)
    783783{
    784784    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    787787}
    788788
    789 void UIWizardNewVMPageExpert::sltStartHeadlessChanged(bool fStartHeadless)
     789void UIWizardNewVMExpertPage::sltStartHeadlessChanged(bool fStartHeadless)
    790790{
    791791    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    794794}
    795795
    796 void UIWizardNewVMPageExpert::updateVirtualMediumPathFromMachinePathName()
     796void UIWizardNewVMExpertPage::updateVirtualMediumPathFromMachinePathName()
    797797{
    798798    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    820820}
    821821
    822 void UIWizardNewVMPageExpert::updateDiskWidgetsAfterMediumFormatChange()
     822void UIWizardNewVMExpertPage::updateDiskWidgetsAfterMediumFormatChange()
    823823{
    824824    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    840840}
    841841
    842 void UIWizardNewVMPageExpert::setEnableNewDiskWidgets(bool fEnable)
     842void UIWizardNewVMExpertPage::setEnableNewDiskWidgets(bool fEnable)
    843843{
    844844    if (m_pSizeAndLocationGroup)
    … …  
    850850}
    851851
    852 QWidget *UIWizardNewVMPageExpert::createNameOSTypeWidgets()
     852QWidget *UIWizardNewVMExpertPage::createNameOSTypeWidgets()
    853853{
    854854    QWidget *pContainerWidget = new QWidget;
    … …  
    870870}
    871871
    872 void UIWizardNewVMPageExpert::setSkipCheckBoxEnable()
     872void UIWizardNewVMExpertPage::setSkipCheckBoxEnable()
    873873{
    874874    AssertReturnVoid(m_pSkipUnattendedCheckBox && m_pNameAndSystemEditor);
    … …  
    879879        return;
    880880    }
    881     m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor));
    882 }
    883 
    884 void UIWizardNewVMPageExpert::updateHostnameDomainNameFromMachineName()
     881    m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
     882}
     883
     884void UIWizardNewVMExpertPage::updateHostnameDomainNameFromMachineName()
    885885{
    886886    if (!m_pAdditionalOptionsContainer)
    … …  
    898898}
    899899
    900 bool UIWizardNewVMPageExpert::isUnattendedEnabled() const
     900bool UIWizardNewVMExpertPage::isUnattendedEnabled() const
    901901{
    902902    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    905905}
    906906
    907 void UIWizardNewVMPageExpert::setEnableDiskSelectionWidgets(bool fEnabled)
     907void UIWizardNewVMExpertPage::setEnableDiskSelectionWidgets(bool fEnabled)
    908908{
    909909    if (!m_pDiskSelector || !m_pDiskSelectionButton)

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageExpert class declaration.
     3 * VBox Qt GUI - UIWizardNewVMExpertPage class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageExpert_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageExpert_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMExpertPage_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMExpertPage_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    2727/* GUI includes: */
    2828#include "UINativeWizardPage.h"
    29 #include "UIWizardNewVMDiskPageBasic.h"
     29#include "UIWizardNewVMDiskPage.h"
    3030
    3131/* Forward declarations: */
    … …  
    4747
    4848/** Expert page of the New Virtual Machine wizard. */
    49 class UIWizardNewVMPageExpert : public UINativeWizardPage
     49class UIWizardNewVMExpertPage : public UINativeWizardPage
    5050{
    5151    Q_OBJECT;
    … …  
    5353public:
    5454
    55     UIWizardNewVMPageExpert();
     55    UIWizardNewVMExpertPage();
    5656
    5757private slots:
    … …  
    151151};
    152152
    153 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageExpert_h */
     153#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMExpertPage_h */

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMHardwarePageBasic class implementation.
     3 * VBox Qt GUI - UIWizardNewVMHardwarePage class implementation.
    44 */
    55
    … …  
    2525#include "UIWizardNewVM.h"
    2626#include "UIWizardNewVMEditors.h"
    27 #include "UIWizardNewVMHardwarePageBasic.h"
     27#include "UIWizardNewVMHardwarePage.h"
    2828
    2929/* COM includes: */
    3030#include "CGuestOSType.h"
    3131
    32 UIWizardNewVMHardwarePageBasic::UIWizardNewVMHardwarePageBasic()
     32UIWizardNewVMHardwarePage::UIWizardNewVMHardwarePage()
    3333    : m_pLabel(0)
    3434    , m_pHardwareWidgetContainer(0)
    … …  
    3838}
    3939
    40 void UIWizardNewVMHardwarePageBasic::prepare()
     40void UIWizardNewVMHardwarePage::prepare()
    4141{
    4242    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    5252}
    5353
    54 void UIWizardNewVMHardwarePageBasic::createConnections()
     54void UIWizardNewVMHardwarePage::createConnections()
    5555{
    5656    if (m_pHardwareWidgetContainer)
    5757    {
    5858        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigMemorySizeChanged,
    59                 this, &UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged);
     59                this, &UIWizardNewVMHardwarePage::sltMemorySizeChanged);
    6060        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigCPUCountChanged,
    61                 this, &UIWizardNewVMHardwarePageBasic::sltCPUCountChanged);
     61                this, &UIWizardNewVMHardwarePage::sltCPUCountChanged);
    6262        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigEFIEnabledChanged,
    63                 this, &UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged);
     63                this, &UIWizardNewVMHardwarePage::sltEFIEnabledChanged);
    6464    }
    6565}
    6666
    67 void UIWizardNewVMHardwarePageBasic::retranslateUi()
     67void UIWizardNewVMHardwarePage::retranslateUi()
    6868{
    6969    setTitle(UIWizardNewVM::tr("Hardware"));
    … …  
    7474}
    7575
    76 void UIWizardNewVMHardwarePageBasic::initializePage()
     76void UIWizardNewVMHardwarePage::initializePage()
    7777{
    7878    retranslateUi();
    … …  
    9898}
    9999
    100 bool UIWizardNewVMHardwarePageBasic::isComplete() const
     100bool UIWizardNewVMHardwarePage::isComplete() const
    101101{
    102102    return true;
    103103}
    104104
    105 void UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged(int iValue)
     105void UIWizardNewVMHardwarePage::sltMemorySizeChanged(int iValue)
    106106{
    107107    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    110110}
    111111
    112 void UIWizardNewVMHardwarePageBasic::sltCPUCountChanged(int iCount)
     112void UIWizardNewVMHardwarePage::sltCPUCountChanged(int iCount)
    113113{
    114114    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    116116}
    117117
    118 void UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged(bool fEnabled)
     118void UIWizardNewVMHardwarePage::sltEFIEnabledChanged(bool fEnabled)
    119119{
    120120    AssertReturnVoid(wizardWindow<UIWizardNewVM>());

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMHardwarePageBasic class declaration.
     3 * VBox Qt GUI - UIWizardNewVMHardwarePage class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePageBasic_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePageBasic_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePage_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePage_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3232class UINewVMHardwareContainer;
    3333
    34 class UIWizardNewVMHardwarePageBasic : public UINativeWizardPage
     34class UIWizardNewVMHardwarePage : public UINativeWizardPage
    3535{
    3636    Q_OBJECT;
    … …  
    3838public:
    3939
    40     UIWizardNewVMHardwarePageBasic();
     40    UIWizardNewVMHardwarePage();
    4141
    4242private slots:
    … …  
    6666};
    6767
    68 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePageBasic_h */
     68#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMHardwarePage_h */

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

    r91058 r91059  
    2626#include "UIMessageCenter.h"
    2727#include "UINameAndSystemEditor.h"
    28 #include "UIWizardNewVMNameOSTypePageBasic.h"
     28#include "UIWizardNewVMNameOSTypePage.h"
    2929#include "UIWizardNewVM.h"
    3030
    … …  
    173173};
    174174
    175 bool UIWizardNewVMNameOSTypePage::guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName)
     175bool UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName)
    176176{
    177177    CHost host = uiCommon().host();
    … …  
    196196}
    197197
    198 void UIWizardNewVMNameOSTypePage::composeMachineFilePath(UINameAndSystemEditor *pNameAndSystemEditor,
     198void UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(UINameAndSystemEditor *pNameAndSystemEditor,
    199199                                                         UIWizardNewVM *pWizard)
    200200{
    … …  
    217217}
    218218
    219 bool UIWizardNewVMNameOSTypePage::createMachineFolder(UINameAndSystemEditor *pNameAndSystemEditor,
     219bool UIWizardNewVMNameOSTypeCommon::createMachineFolder(UINameAndSystemEditor *pNameAndSystemEditor,
    220220                                                      UINativeWizardPage *pCaller,
    221221                                                      UIWizardNewVM *pWizard)
    … …  
    258258}
    259259
    260 bool UIWizardNewVMNameOSTypePage::cleanupMachineFolder(UIWizardNewVM *pWizard, bool fWizardCancel /* = false */)
     260bool UIWizardNewVMNameOSTypeCommon::cleanupMachineFolder(UIWizardNewVM *pWizard, bool fWizardCancel /* = false */)
    261261{
    262262    if (!pWizard)
    … …  
    281281}
    282282
    283 void UIWizardNewVMNameOSTypePage::determineOSType(const QString &strISOPath, UIWizardNewVM *pWizard)
     283void UIWizardNewVMNameOSTypeCommon::determineOSType(const QString &strISOPath, UIWizardNewVM *pWizard)
    284284{
    285285    if (!pWizard)
    … …  
    299299}
    300300
    301 bool UIWizardNewVMNameOSTypePage::checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor)
     301bool UIWizardNewVMNameOSTypeCommon::checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor)
    302302{
    303303    if (!pNameAndSystemEditor)
    … …  
    312312}
    313313
    314 UIWizardNewVMNameOSTypePageBasic::UIWizardNewVMNameOSTypePageBasic()
     314UIWizardNewVMNameOSTypePage::UIWizardNewVMNameOSTypePage()
    315315    : m_pNameAndSystemLayout(0)
    316316    , m_pNameAndSystemEditor(0)
    … …  
    321321}
    322322
    323 void UIWizardNewVMNameOSTypePageBasic::prepare()
     323void UIWizardNewVMNameOSTypePage::prepare()
    324324{
    325325    QVBoxLayout *pPageLayout = new QVBoxLayout(this);
    … …  
    339339}
    340340
    341 void UIWizardNewVMNameOSTypePageBasic::createConnections()
     341void UIWizardNewVMNameOSTypePage::createConnections()
    342342{
    343343    if (m_pNameAndSystemEditor)
    344344    {
    345         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltNameChanged);
    346         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltPathChanged);
    347         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltOsTypeChanged);
    348         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltISOPathChanged);
    349         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged);
     345        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMNameOSTypePage::sltNameChanged);
     346        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMNameOSTypePage::sltPathChanged);
     347        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMNameOSTypePage::sltOsTypeChanged);
     348        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged, this, &UIWizardNewVMNameOSTypePage::sltISOPathChanged);
     349        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged, this, &UIWizardNewVMNameOSTypePage::sltGuestOSFamilyChanged);
    350350    }
    351351    if (m_pSkipUnattendedCheckBox)
    352         connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMNameOSTypePageBasic::sltSkipUnattendedInstallChanged);
    353 }
    354 
    355 bool UIWizardNewVMNameOSTypePageBasic::isComplete() const
     352        connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMNameOSTypePage::sltSkipUnattendedInstallChanged);
     353}
     354
     355bool UIWizardNewVMNameOSTypePage::isComplete() const
    356356{
    357357    markWidgets();
    358358    if (m_pNameAndSystemEditor->name().isEmpty())
    359359        return false;
    360     return UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor);
    361 }
    362 
    363 void UIWizardNewVMNameOSTypePageBasic::sltNameChanged(const QString &strNewName)
     360    return UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor);
     361}
     362
     363void UIWizardNewVMNameOSTypePage::sltNameChanged(const QString &strNewName)
    364364{
    365365    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    367367    {
    368368        m_pNameAndSystemEditor->blockSignals(true);
    369         if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
     369        if (UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
    370370            wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    371371        m_pNameAndSystemEditor->blockSignals(false);
    372372    }
    373     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
     373    UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    374374    emit completeChanged();
    375375}
    376376
    377 void UIWizardNewVMNameOSTypePageBasic::sltPathChanged(const QString &strNewPath)
     377void UIWizardNewVMNameOSTypePage::sltPathChanged(const QString &strNewPath)
    378378{
    379379    Q_UNUSED(strNewPath);
    380     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    381 }
    382 
    383 void UIWizardNewVMNameOSTypePageBasic::sltOsTypeChanged()
     380    UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
     381}
     382
     383void UIWizardNewVMNameOSTypePage::sltOsTypeChanged()
    384384{
    385385    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    389389}
    390390
    391 void UIWizardNewVMNameOSTypePageBasic::retranslateUi()
     391void UIWizardNewVMNameOSTypePage::retranslateUi()
    392392{
    393393    setTitle(UIWizardNewVM::tr("Virtual machine Name and Operating System"));
    … …  
    410410}
    411411
    412 void UIWizardNewVMNameOSTypePageBasic::initializePage()
     412void UIWizardNewVMNameOSTypePage::initializePage()
    413413{
    414414    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    438438}
    439439
    440 bool UIWizardNewVMNameOSTypePageBasic::validatePage()
     440bool UIWizardNewVMNameOSTypePage::validatePage()
    441441{
    442442    /* Try to create machine folder: */
    443     return UIWizardNewVMNameOSTypePage::createMachineFolder(m_pNameAndSystemEditor, this, wizardWindow<UIWizardNewVM>());
    444 }
    445 
    446 void UIWizardNewVMNameOSTypePageBasic::sltISOPathChanged(const QString &strPath)
     443    return UIWizardNewVMNameOSTypeCommon::createMachineFolder(m_pNameAndSystemEditor, this, wizardWindow<UIWizardNewVM>());
     444}
     445
     446void UIWizardNewVMNameOSTypePage::sltISOPathChanged(const QString &strPath)
    447447{
    448448    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(this->wizard());
    449449    AssertReturnVoid(pWizard);
    450     UIWizardNewVMNameOSTypePage::determineOSType(strPath, pWizard);
     450    UIWizardNewVMNameOSTypeCommon::determineOSType(strPath, pWizard);
    451451
    452452    if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
    453             UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     453            UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
    454454    pWizard->setISOFilePath(strPath);
    455455
    … …  
    462462}
    463463
    464 void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId)
     464void UIWizardNewVMNameOSTypePage::sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId)
    465465{
    466466    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    468468}
    469469
    470 void UIWizardNewVMNameOSTypePageBasic::sltSkipUnattendedInstallChanged(bool fSkip)
     470void UIWizardNewVMNameOSTypePage::sltSkipUnattendedInstallChanged(bool fSkip)
    471471{
    472472    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    475475}
    476476
    477 QWidget *UIWizardNewVMNameOSTypePageBasic::createNameOSTypeWidgets()
     477QWidget *UIWizardNewVMNameOSTypePage::createNameOSTypeWidgets()
    478478{
    479479    /* Prepare container widget: */
    … …  
    507507}
    508508
    509 void UIWizardNewVMNameOSTypePageBasic::markWidgets() const
     509void UIWizardNewVMNameOSTypePage::markWidgets() const
    510510{
    511511    if (m_pNameAndSystemEditor)
    512512    {
    513513        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty());
    514         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypePage::checkISOFile(m_pNameAndSystemEditor),
     514        m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
    515515                                                UIWizardNewVM::tr("Invalid file path or unreadable file"));
    516516    }
    517517}
    518518
    519 void UIWizardNewVMNameOSTypePageBasic::setSkipCheckBoxEnable()
     519void UIWizardNewVMNameOSTypePage::setSkipCheckBoxEnable()
    520520{
    521521    if (!m_pSkipUnattendedCheckBox)
    … …  
    528528}
    529529
    530 bool UIWizardNewVMNameOSTypePageBasic::isUnattendedEnabled() const
     530bool UIWizardNewVMNameOSTypePage::isUnattendedEnabled() const
    531531{
    532532    if (!m_pNameAndSystemEditor)

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMNameOSTypePageBasic class declaration.
     3 * VBox Qt GUI - UIWizardNewVMNameOSTypePage class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePageBasic_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePageBasic_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePage_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePage_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3232class UIWizardNewVM;
    3333
    34 namespace UIWizardNewVMNameOSTypePage
     34namespace UIWizardNewVMNameOSTypeCommon
    3535{
    3636    bool guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName);
    … …  
    5050
    5151/** 1st page of the New Virtual Machine wizard (basic extension). */
    52 class UIWizardNewVMNameOSTypePageBasic : public UINativeWizardPage
     52class UIWizardNewVMNameOSTypePage : public UINativeWizardPage
    5353{
    5454    Q_OBJECT;
    … …  
    5757
    5858    /** Constructor. */
    59     UIWizardNewVMNameOSTypePageBasic();
     59    UIWizardNewVMNameOSTypePage();
    6060
    6161
    … …  
    9999};
    100100
    101 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePageBasic_h */
     101#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMNameOSTypePage_h */

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMUnattendedPageBasic class implementation.
     3 * VBox Qt GUI - UIWizardNewVMUnattendedPage class implementation.
    44 */
    55
    … …  
    2323#include "QIRichTextLabel.h"
    2424#include "UIWizardNewVMEditors.h"
    25 #include "UIWizardNewVMUnattendedPageBasic.h"
     25#include "UIWizardNewVMUnattendedPage.h"
    2626#include "UIWizardNewVM.h"
    2727
    28 bool UIWizardNewVMUnattendedPage::checkGAISOFile(const QString &strPath)
     28bool UIWizardNewVMUnattendedCommon::checkGAISOFile(const QString &strPath)
    2929{
    3030    if (strPath.isNull() || strPath.isEmpty())
    … …  
    3636}
    3737
    38 UIWizardNewVMUnattendedPageBasic::UIWizardNewVMUnattendedPageBasic()
     38UIWizardNewVMUnattendedPage::UIWizardNewVMUnattendedPage()
    3939    : m_pLabel(0)
    4040    , m_pAdditionalOptionsContainer(0)
    … …  
    4545}
    4646
    47 void UIWizardNewVMUnattendedPageBasic::prepare()
     47void UIWizardNewVMUnattendedPage::prepare()
    4848{
    4949    QGridLayout *pMainLayout = new QGridLayout(this);
    … …  
    7070}
    7171
    72 void UIWizardNewVMUnattendedPageBasic::createConnections()
     72void UIWizardNewVMUnattendedPage::createConnections()
    7373{
    7474    if (m_pUserNamePasswordGroupBox)
    7575    {
    7676        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigPasswordChanged,
    77                 this, &UIWizardNewVMUnattendedPageBasic::sltPasswordChanged);
     77                this, &UIWizardNewVMUnattendedPage::sltPasswordChanged);
    7878        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigUserNameChanged,
    79                 this, &UIWizardNewVMUnattendedPageBasic::sltUserNameChanged);
     79                this, &UIWizardNewVMUnattendedPage::sltUserNameChanged);
    8080    }
    8181    if (m_pGAInstallationISOContainer)
    8282    {
    8383        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::toggled,
    84                 this, &UIWizardNewVMUnattendedPageBasic::sltInstallGACheckBoxToggle);
     84                this, &UIWizardNewVMUnattendedPage::sltInstallGACheckBoxToggle);
    8585        connect(m_pGAInstallationISOContainer, &UIGAInstallationGroupBox::sigPathChanged,
    86                 this, &UIWizardNewVMUnattendedPageBasic::sltGAISOPathChanged);
     86                this, &UIWizardNewVMUnattendedPage::sltGAISOPathChanged);
    8787    }
    8888
    … …  
    9090    {
    9191        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigHostnameDomainNameChanged,
    92                 this, &UIWizardNewVMUnattendedPageBasic::sltHostnameDomainNameChanged);
     92                this, &UIWizardNewVMUnattendedPage::sltHostnameDomainNameChanged);
    9393        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigProductKeyChanged,
    94                 this, &UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged);
     94                this, &UIWizardNewVMUnattendedPage::sltProductKeyChanged);
    9595        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged,
    96                 this, &UIWizardNewVMUnattendedPageBasic::sltStartHeadlessChanged);
    97     }
    98 }
    99 
    100 
    101 void UIWizardNewVMUnattendedPageBasic::retranslateUi()
     96                this, &UIWizardNewVMUnattendedPage::sltStartHeadlessChanged);
     97    }
     98}
     99
     100
     101void UIWizardNewVMUnattendedPage::retranslateUi()
    102102{
    103103    setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
    … …  
    111111
    112112
    113 void UIWizardNewVMUnattendedPageBasic::initializePage()
     113void UIWizardNewVMUnattendedPage::initializePage()
    114114{
    115115    if (m_pAdditionalOptionsContainer)
    … …  
    157157}
    158158
    159 bool UIWizardNewVMUnattendedPageBasic::isComplete() const
     159bool UIWizardNewVMUnattendedPage::isComplete() const
    160160{
    161161    markWidgets();
    … …  
    163163    if (pWizard && pWizard->installGuestAdditions() &&
    164164        m_pGAInstallationISOContainer &&
    165         !UIWizardNewVMUnattendedPage::checkGAISOFile(m_pGAInstallationISOContainer->path()))
     165        !UIWizardNewVMUnattendedCommon::checkGAISOFile(m_pGAInstallationISOContainer->path()))
    166166        return false;
    167167    if (m_pUserNamePasswordGroupBox && !m_pUserNamePasswordGroupBox->isComplete())
    … …  
    172172}
    173173
    174 void UIWizardNewVMUnattendedPageBasic::sltInstallGACheckBoxToggle(bool fEnabled)
     174void UIWizardNewVMUnattendedPage::sltInstallGACheckBoxToggle(bool fEnabled)
    175175{
    176176    wizardWindow<UIWizardNewVM>()->setInstallGuestAdditions(fEnabled);
    … …  
    179179}
    180180
    181 void UIWizardNewVMUnattendedPageBasic::sltGAISOPathChanged(const QString &strPath)
     181void UIWizardNewVMUnattendedPage::sltGAISOPathChanged(const QString &strPath)
    182182{
    183183    wizardWindow<UIWizardNewVM>()->setGuestAdditionsISOPath(strPath);
    … …  
    186186}
    187187
    188 void UIWizardNewVMUnattendedPageBasic::sltPasswordChanged(const QString &strPassword)
     188void UIWizardNewVMUnattendedPage::sltPasswordChanged(const QString &strPassword)
    189189{
    190190    wizardWindow<UIWizardNewVM>()->setPassword(strPassword);
    … …  
    193193}
    194194
    195 void UIWizardNewVMUnattendedPageBasic::sltUserNameChanged(const QString &strUserName)
     195void UIWizardNewVMUnattendedPage::sltUserNameChanged(const QString &strUserName)
    196196{
    197197    wizardWindow<UIWizardNewVM>()->setUserName(strUserName);
    … …  
    200200}
    201201
    202 bool UIWizardNewVMUnattendedPageBasic::isProductKeyWidgetEnabled() const
     202bool UIWizardNewVMUnattendedPage::isProductKeyWidgetEnabled() const
    203203{
    204204    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    … …  
    208208}
    209209
    210 void UIWizardNewVMUnattendedPageBasic::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
     210void UIWizardNewVMUnattendedPage::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
    211211{
    212212    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    216216}
    217217
    218 void UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged(const QString &strProductKey)
     218void UIWizardNewVMUnattendedPage::sltProductKeyChanged(const QString &strProductKey)
    219219{
    220220    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    … …  
    223223}
    224224
    225 void UIWizardNewVMUnattendedPageBasic::sltStartHeadlessChanged(bool fStartHeadless)
     225void UIWizardNewVMUnattendedPage::sltStartHeadlessChanged(bool fStartHeadless)
    226226{
    227227    m_userModifiedParameters << "StartHeadless";
    … …  
    229229}
    230230
    231 void UIWizardNewVMUnattendedPageBasic::markWidgets() const
     231void UIWizardNewVMUnattendedPage::markWidgets() const
    232232{
    233233    AssertReturnVoid(wizardWindow<UIWizardNewVM>());

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

    r91058 r91059  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMUnattendedPageBasic class declaration.
     3 * VBox Qt GUI - UIWizardNewVMUnattendedPage class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPageBasic_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPageBasic_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPage_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPage_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3131class UIUserNamePasswordGroupBox;
    3232
    33 namespace UIWizardNewVMUnattendedPage
     33namespace UIWizardNewVMUnattendedCommon
    3434{
    3535    /** Returns false if ISO path selector is non empty but has invalid file path. */
    … …  
    3737}
    3838
    39 class UIWizardNewVMUnattendedPageBasic : public UINativeWizardPage
     39class UIWizardNewVMUnattendedPage : public UINativeWizardPage
    4040{
    4141    Q_OBJECT;
    … …  
    4343public:
    4444
    45     UIWizardNewVMUnattendedPageBasic();
     45    UIWizardNewVMUnattendedPage();
    4646
    4747private slots:
    … …  
    7777};
    7878
    79 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPageBasic_h */
     79#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMUnattendedPage_h */
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