VirtualBox

Changeset 90990 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 30, 2021 9:38:18 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
146630
Message:

FE/Qt: bugref:9996. Removing property set macros.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/wizards
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizardPage.h

    r90750 r90990  
    7474    UINativeWizard *wizard() const;
    7575
     76    template<typename T>
     77        T *wizardWindow() const
     78    {
     79        return   parentWidget() && parentWidget()->window()
     80            ? qobject_cast<T*>(parentWidget()->window())
     81            : 0;
     82    }
     83
     84
    7685    /** Holds the page title. */
    7786    QString  m_strTitle;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

    r90885 r90990  
    7575void UIWizardCloneVDPageExpert::sltMediumFormatChanged()
    7676{
    77     if (cloneWizard() && m_pFormatGroupBox)
    78         cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
     77    if (wizardWindow<UIWizardCloneVD>() && m_pFormatGroupBox)
     78        wizardWindow<UIWizardCloneVD>()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
    7979    updateDiskWidgetsAfterMediumFormatChange();
    8080    emit completeChanged();
    … …  
    8383void UIWizardCloneVDPageExpert::sltSelectLocationButtonClicked()
    8484{
    85     UIWizardCloneVD *pWizard = cloneWizard();
     85    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    8686    AssertReturnVoid(pWizard);
    8787    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    … …  
    100100void UIWizardCloneVDPageExpert::sltMediumVariantChanged(qulonglong uVariant)
    101101{
    102     if (cloneWizard())
    103         cloneWizard()->setMediumVariant(uVariant);
     102    if (wizardWindow<UIWizardCloneVD>())
     103        wizardWindow<UIWizardCloneVD>()->setMediumVariant(uVariant);
    104104}
    105105
    106106void UIWizardCloneVDPageExpert::sltMediumSizeChanged(qulonglong uSize)
    107107{
    108     UIWizardCloneVD *pWizard = cloneWizard();
     108    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    109109    AssertReturnVoid(pWizard);
    110110    pWizard->setMediumSize(uSize);
    … …  
    114114void UIWizardCloneVDPageExpert::sltMediumPathChanged(const QString &strPath)
    115115{
    116     UIWizardCloneVD *pWizard = cloneWizard();
     116    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    117117    AssertReturnVoid(pWizard);
    118118    QString strMediumPath =
    … …  
    129129void UIWizardCloneVDPageExpert::initializePage()
    130130{
    131     AssertReturnVoid(cloneWizard() && m_pMediumSizePathGroupBox && m_pFormatGroupBox && m_pVariantGroupBox);
    132     UIWizardCloneVD *pWizard = cloneWizard();
     131    AssertReturnVoid(wizardWindow<UIWizardCloneVD>() && m_pMediumSizePathGroupBox && m_pFormatGroupBox && m_pVariantGroupBox);
     132    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    133133
    134134    pWizard->setMediumFormat(m_pFormatGroupBox->mediumFormat());
    … …  
    172172bool UIWizardCloneVDPageExpert::validatePage()
    173173{
    174     UIWizardCloneVD *pWizard = cloneWizard();
     174    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    175175    AssertReturn(pWizard, false);
    176176
    … …  
    185185}
    186186
    187 UIWizardCloneVD *UIWizardCloneVDPageExpert::cloneWizard()
    188 {
    189     return qobject_cast<UIWizardCloneVD*>(wizard());
    190 }
    191 
    192187void UIWizardCloneVDPageExpert::updateDiskWidgetsAfterMediumFormatChange()
    193188{
    194     UIWizardCloneVD *pWizard = qobject_cast<UIWizardCloneVD*>(wizard());
     189    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    195190    AssertReturnVoid(pWizard && m_pVariantGroupBox && m_pMediumSizePathGroupBox && m_pFormatGroupBox);
    196191    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.h

    r90854 r90990  
    7575    /** Sets the target disk name and location. */
    7676    void setTargetLocation();
    77     UIWizardCloneVD *cloneWizard();
    7877    void updateDiskWidgetsAfterMediumFormatChange();
    7978

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageFormat.cpp

    r90827 r90990  
    6666void UIWizardCloneVDPageFormat::initializePage()
    6767{
     68    AssertReturnVoid(wizardWindow<UIWizardCloneVD>());
    6869    /* Translate page: */
    6970    retranslateUi();
    7071    if (!m_userModifiedParameters.contains("MediumFormat"))
    7172    {
    72         if (cloneWizard() && m_pFormatGroupBox)
    73             cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
     73        if (m_pFormatGroupBox)
     74            wizardWindow<UIWizardCloneVD>()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
    7475    }
    7576}
    … …  
    8788void UIWizardCloneVDPageFormat::sltMediumFormatChanged()
    8889{
    89     if (cloneWizard() && m_pFormatGroupBox)
    90         cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
     90    AssertReturnVoid(wizardWindow<UIWizardCloneVD>());
     91    if (m_pFormatGroupBox)
     92        wizardWindow<UIWizardCloneVD>()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
    9193    m_userModifiedParameters << "MediumFormat";
    9294    emit completeChanged();
    9395}
    94 
    95 UIWizardCloneVD *UIWizardCloneVDPageFormat::cloneWizard() const
    96 {
    97     return qobject_cast<UIWizardCloneVD*>(wizard());
    98 }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageFormat.h

    r90827 r90990  
    5454private:
    5555
    56     UIWizardCloneVD *cloneWizard() const;
    57 
    5856    /** Handles translation event. */
    5957    virtual void retranslateUi() /* override */;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPagePathSize.cpp

    r90827 r90990  
    6060void UIWizardCloneVDPagePathSize::initializePage()
    6161{
    62     AssertReturnVoid(cloneWizard() && m_pMediumSizePathGroupBox);
     62    AssertReturnVoid(wizardWindow<UIWizardCloneVD>() && m_pMediumSizePathGroupBox);
    6363    /* Translate page: */
    6464    retranslateUi();
    65     UIWizardCloneVD *pWizard = cloneWizard();
     65    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    6666    m_pMediumSizePathGroupBox->blockSignals(true);
    6767
    … …  
    9797bool UIWizardCloneVDPagePathSize::validatePage()
    9898{
    99     UIWizardCloneVD *pWizard = cloneWizard();
     99    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    100100    AssertReturn(pWizard, false);
    101101    /* Make sure such file doesn't exists already: */
    … …  
    109109}
    110110
    111 UIWizardCloneVD *UIWizardCloneVDPagePathSize::cloneWizard() const
    112 {
    113     return qobject_cast<UIWizardCloneVD*>(wizard());
    114 }
    115 
    116111void UIWizardCloneVDPagePathSize::sltSelectLocationButtonClicked()
    117112{
    118     UIWizardCloneVD *pWizard = cloneWizard();
     113    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    119114    AssertReturnVoid(pWizard);
    120115    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    … …  
    133128void UIWizardCloneVDPagePathSize::sltMediumPathChanged(const QString &strPath)
    134129{
    135     UIWizardCloneVD *pWizard = cloneWizard();
     130    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    136131    AssertReturnVoid(pWizard);
    137132    m_userModifiedParameters << "MediumPath";
    … …  
    145140void UIWizardCloneVDPagePathSize::sltMediumSizeChanged(qulonglong uSize)
    146141{
    147     UIWizardCloneVD *pWizard = cloneWizard();
     142    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    148143    AssertReturnVoid(pWizard);
    149144    m_userModifiedParameters << "MediumSize";

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPagePathSize.h

    r90827 r90990  
    6868    /** Returns whether the page is valid. */
    6969    virtual bool validatePage() /* override */;
    70     UIWizardCloneVD *cloneWizard() const;
    7170
    7271    UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroupBox;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageVariant.cpp

    r90854 r90990  
    9292void UIWizardCloneVDPageVariant::initializePage()
    9393{
    94     AssertReturnVoid(cloneWizard());
     94    AssertReturnVoid(wizardWindow<UIWizardCloneVD>());
    9595    /* Translate page: */
    9696    retranslateUi();
    9797
    98     setWidgetVisibility(cloneWizard()->mediumFormat());
     98    setWidgetVisibility(wizardWindow<UIWizardCloneVD>()->mediumFormat());
    9999    if (m_pVariantGroupBox)
    100         cloneWizard()->setMediumVariant(m_pVariantGroupBox->mediumVariant());
     100        wizardWindow<UIWizardCloneVD>()->setMediumVariant(m_pVariantGroupBox->mediumVariant());
    101101}
    102102
    … …  
    105105    AssertReturn(m_pVariantGroupBox, false);
    106106    return m_pVariantGroupBox->isComplete();
    107 }
    108 
    109 UIWizardCloneVD *UIWizardCloneVDPageVariant::cloneWizard() const
    110 {
    111     return qobject_cast<UIWizardCloneVD*>(wizard());
    112107}
    113108
    … …  
    128123void UIWizardCloneVDPageVariant::sltMediumVariantChanged(qulonglong uVariant)
    129124{
    130     if (cloneWizard())
    131         cloneWizard()->setMediumVariant(uVariant);
     125    if (wizardWindow<UIWizardCloneVD>())
     126        wizardWindow<UIWizardCloneVD>()->setMediumVariant(uVariant);
    132127}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageVariant.h

    r90827 r90990  
    5252    virtual void retranslateUi() /* override */;
    5353    void prepare();
    54     UIWizardCloneVD *cloneWizard() const;
    5554
    5655    /** Prepares the page. */

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

    r90714 r90990  
    3030#include "CMachine.h"
    3131#include "CSnapshot.h"
    32 
    33 #define cloneVMWizardPropertySet(functionName, value)                   \
    34     do                                                                  \
    35     {                                                                   \
    36         UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard()); \
    37         if (pWizard)                                                    \
    38             pWizard->set##functionName(value);                          \
    39     }                                                                   \
    40     while(0)
    41 
    4232
    4333/* Clone VM wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMModePageBasic.cpp

    r90739 r90990  
    9292void UIWizardCloneVMModePageBasic::initializePage()
    9393{
     94
     95    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    9496    if (m_pCloneModeGroupBox && !m_userModifiedParameters.contains("CloneMode"))
    95         cloneVMWizardPropertySet(CloneMode, m_pCloneModeGroupBox->cloneMode());
     97        wizardWindow<UIWizardCloneVM>()->setCloneMode(m_pCloneModeGroupBox->cloneMode());
    9698
    9799    retranslateUi();
    … …  
    102104    bool fResult = true;
    103105
    104     UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard());
     106    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
    105107    AssertReturn(pWizard, false);
    106108    /* Try to clone VM: */
    … …  
    112114void UIWizardCloneVMModePageBasic::sltCloneModeChanged(KCloneMode enmCloneMode)
    113115{
     116    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    114117    m_userModifiedParameters << "CloneMode";
    115     cloneVMWizardPropertySet(CloneMode, enmCloneMode);
     118    wizardWindow<UIWizardCloneVM>()->setCloneMode(enmCloneMode);
    116119}

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

    r90739 r90990  
    3535class UICloneVMCloneModeGroupBox;
    3636
    37 // /* 3rd page of the Clone Virtual Machine wizard (base part): */
    38 // class UIWizardCloneVMPage3 : public UIWizardPageBase
    39 // {
    40 // protected:
    41 
    42 //     /* Constructor: */
    43 //     UIWizardCloneVMPage3(bool fShowChildsOption);
    44 
    45 //     /* Stuff for 'cloneMode' field: */
    46 //     KCloneMode cloneMode() const;
    47 //     void setCloneMode(KCloneMode cloneMode);
    48 
    49 //     /* Variables: */
    50 
    51 //     /* Widgets: */
    52 //     QRadioButton *m_pMachineRadio;
    53 //     QRadioButton *m_pMachineAndChildsRadio;
    54 //     QRadioButton *m_pAllRadio;
    55 // };
    56 
    5737/* 3rd page of the Clone Virtual Machine wizard (basic extension): */
    5838class UIWizardCloneVMModePageBasic : public UINativeWizardPage

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMNamePathPageBasic.cpp

    r90739 r90990  
    6767void UIWizardCloneVMNamePathPageBasic::initializePage()
    6868{
     69    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
     70    AssertReturnVoid(pWizard);
    6971    retranslateUi();
    7072    if (m_pNamePathEditor)
    … …  
    7274        m_pNamePathEditor->setFocus();
    7375        if (!m_userModifiedParameters.contains("CloneName"))
    74             cloneVMWizardPropertySet(CloneName, m_pNamePathEditor->cloneName());
    75             if (!m_userModifiedParameters.contains("CloneFilePath"))
    76                 cloneVMWizardPropertySet(CloneFilePath,
    77                              UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathEditor->cloneName(), m_strGroup, m_pNamePathEditor->clonePath()));
     76            pWizard->setCloneName(m_pNamePathEditor->cloneName());
     77        if (!m_userModifiedParameters.contains("CloneFilePath"))
     78            pWizard->setCloneFilePath(UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathEditor->cloneName(),
     79                                                                                        m_strGroup, m_pNamePathEditor->clonePath()));
     80
    7881    }
    7982    if (m_pAdditionalOptionsEditor)
    8083    {
    8184        if (!m_userModifiedParameters.contains("MacAddressPolicy"))
    82             cloneVMWizardPropertySet(MacAddressPolicy, m_pAdditionalOptionsEditor->macAddressClonePolicy());
     85            pWizard->setMacAddressPolicy(m_pAdditionalOptionsEditor->macAddressClonePolicy());
    8386        if (!m_userModifiedParameters.contains("KeepDiskNames"))
    84             cloneVMWizardPropertySet(KeepDiskNames, m_pAdditionalOptionsEditor->keepDiskNames());
     87            pWizard->setKeepDiskNames(m_pAdditionalOptionsEditor->keepDiskNames());
    8588        if (!m_userModifiedParameters.contains("KeepHardwareUUIDs"))
    86             cloneVMWizardPropertySet(KeepHardwareUUIDs, m_pAdditionalOptionsEditor->keepHardwareUUIDs());
     89            pWizard->setKeepHardwareUUIDs(m_pAdditionalOptionsEditor->keepHardwareUUIDs());
    8790    }
    8891}
    … …  
    135138void UIWizardCloneVMNamePathPageBasic::sltCloneNameChanged(const QString &strCloneName)
    136139{
     140    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
     141    AssertReturnVoid(pWizard);
    137142    AssertReturnVoid(m_pNamePathEditor);
    138143    m_userModifiedParameters << "CloneName";
    139144    m_userModifiedParameters << "CloneFilePath";
    140     cloneVMWizardPropertySet(CloneName, strCloneName);
    141     cloneVMWizardPropertySet(CloneFilePath,
    142                              UIWizardCloneVMNamePathPage::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathEditor->clonePath()));
     145    pWizard->setCloneName(strCloneName);
     146    pWizard->setCloneFilePath(UIWizardCloneVMNamePathPage::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathEditor->clonePath()));
    143147    emit completeChanged();
    144148}
    … …  
    147151{
    148152    AssertReturnVoid(m_pNamePathEditor);
     153    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    149154    m_userModifiedParameters << "CloneFilePath";
    150     cloneVMWizardPropertySet(CloneFilePath,
    151                              UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathEditor->cloneName(), m_strGroup, strClonePath));
     155    wizardWindow<UIWizardCloneVM>()->setCloneFilePath(UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathEditor->cloneName(), m_strGroup, strClonePath));
    152156    emit completeChanged();
    153157}
    … …  
    155159void UIWizardCloneVMNamePathPageBasic::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy)
    156160{
     161    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    157162    m_userModifiedParameters << "MacAddressPolicy";
    158     cloneVMWizardPropertySet(MacAddressPolicy, enmMACAddressClonePolicy);
     163    wizardWindow<UIWizardCloneVM>()->setMacAddressPolicy(enmMACAddressClonePolicy);
    159164    emit completeChanged();
    160165}
    … …  
    162167void UIWizardCloneVMNamePathPageBasic::sltKeepDiskNamesToggled(bool fKeepDiskNames)
    163168{
     169    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    164170    m_userModifiedParameters << "KeepDiskNames";
    165     cloneVMWizardPropertySet(KeepDiskNames, fKeepDiskNames);
     171    wizardWindow<UIWizardCloneVM>()->setKeepDiskNames(fKeepDiskNames);
    166172    emit completeChanged();
    167173}
    … …  
    169175void UIWizardCloneVMNamePathPageBasic::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs)
    170176{
     177    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    171178    m_userModifiedParameters << "KeepHardwareUUIDs";
    172     cloneVMWizardPropertySet(KeepHardwareUUIDs, fKeepHardwareUUIDs);
     179    wizardWindow<UIWizardCloneVM>()->setKeepHardwareUUIDs(fKeepHardwareUUIDs);
    173180    emit completeChanged();
    174181}

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

    r90739 r90990  
    3333class UICloneVMNamePathEditor;
    3434class QIRichTextLabel;
     35class UIWizardCloneVM;
    3536
    3637namespace UIWizardCloneVMNamePathPage
    … …  
    6667
    6768    QIRichTextLabel *m_pMainLabel;
    68     // QGridLayout     *m_pContainerLayout;
    6969
    7070    UICloneVMNamePathEditor *m_pNamePathEditor;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp

    r90739 r90990  
    100100void UIWizardCloneVMPageExpert::initializePage()
    101101{
     102    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
     103    AssertReturnVoid(pWizard);
    102104    if (m_pNamePathGroupBox)
    103105    {
    104106        m_pNamePathGroupBox->setFocus();
    105         cloneVMWizardPropertySet(CloneName, m_pNamePathGroupBox->cloneName());
    106         cloneVMWizardPropertySet(CloneFilePath,
     107        pWizard->setCloneName(m_pNamePathGroupBox->cloneName());
     108        pWizard->setCloneFilePath(
    107109                                 UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, m_pNamePathGroupBox->clonePath()));
    108110    }
    109111    if (m_pAdditionalOptionsGroupBox)
    110112    {
    111         cloneVMWizardPropertySet(MacAddressPolicy, m_pAdditionalOptionsGroupBox->macAddressClonePolicy());
    112         cloneVMWizardPropertySet(KeepDiskNames, m_pAdditionalOptionsGroupBox->keepDiskNames());
    113         cloneVMWizardPropertySet(KeepHardwareUUIDs, m_pAdditionalOptionsGroupBox->keepHardwareUUIDs());
     113        pWizard->setMacAddressPolicy(m_pAdditionalOptionsGroupBox->macAddressClonePolicy());
     114        pWizard->setKeepDiskNames(m_pAdditionalOptionsGroupBox->keepDiskNames());
     115        pWizard->setKeepHardwareUUIDs(m_pAdditionalOptionsGroupBox->keepHardwareUUIDs());
    114116    }
    115117    if (m_pCloneTypeGroupBox)
    116         cloneVMWizardPropertySet(LinkedClone, !m_pCloneTypeGroupBox->isFullClone());
     118        pWizard->setLinkedClone(!m_pCloneTypeGroupBox->isFullClone());
    117119    if (m_pCloneModeGroupBox)
    118         cloneVMWizardPropertySet(CloneMode, m_pCloneModeGroupBox->cloneMode());
     120        pWizard->setCloneMode(m_pCloneModeGroupBox->cloneMode());
    119121
    120122    retranslateUi();
    … …  
    128130bool UIWizardCloneVMPageExpert::validatePage()
    129131{
    130     return qobject_cast<UIWizardCloneVM*>(wizard())->cloneVM();;
     132    AssertReturn(wizardWindow<UIWizardCloneVM>(), false);
     133    return wizardWindow<UIWizardCloneVM>()->cloneVM();
    131134}
    132135
    133136void UIWizardCloneVMPageExpert::sltCloneNameChanged(const QString &strCloneName)
    134137{
     138    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
     139    AssertReturnVoid(pWizard);
    135140    AssertReturnVoid(m_pNamePathGroupBox);
    136     cloneVMWizardPropertySet(CloneName, strCloneName);
    137     cloneVMWizardPropertySet(CloneFilePath,
     141    pWizard->setCloneName(strCloneName);
     142    pWizard->setCloneFilePath(
    138143                             UIWizardCloneVMNamePathPage::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathGroupBox->clonePath()));
    139144    emit completeChanged();
    … …  
    142147void UIWizardCloneVMPageExpert::sltClonePathChanged(const QString &strClonePath)
    143148{
    144     AssertReturnVoid(m_pNamePathGroupBox);
    145     cloneVMWizardPropertySet(CloneFilePath,
     149    AssertReturnVoid(m_pNamePathGroupBox && wizardWindow<UIWizardCloneVM>());
     150    wizardWindow<UIWizardCloneVM>()->setCloneFilePath(
    146151                             UIWizardCloneVMNamePathPage::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, strClonePath));
    147152    emit completeChanged();
    … …  
    150155void UIWizardCloneVMPageExpert::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy)
    151156{
    152     cloneVMWizardPropertySet(MacAddressPolicy, enmMACAddressClonePolicy);
     157    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
     158    wizardWindow<UIWizardCloneVM>()->setMacAddressPolicy(enmMACAddressClonePolicy);
    153159}
    154160
    155161void UIWizardCloneVMPageExpert::sltKeepDiskNamesToggled(bool fKeepDiskNames)
    156162{
    157     cloneVMWizardPropertySet(KeepDiskNames, fKeepDiskNames);
     163    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
     164    wizardWindow<UIWizardCloneVM>()->setKeepDiskNames(fKeepDiskNames);
    158165}
    159166
    160167void UIWizardCloneVMPageExpert::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs)
    161168{
    162     cloneVMWizardPropertySet(KeepHardwareUUIDs, fKeepHardwareUUIDs);
     169    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
     170    wizardWindow<UIWizardCloneVM>()->setKeepHardwareUUIDs(fKeepHardwareUUIDs);
    163171}

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

    r90702 r90990  
    3333class UICloneVMCloneTypeGroupBox;
    3434class UICloneVMNamePathEditor;
    35 
     35class UIWizardCloneVM;
    3636
    3737/* Expert page of the Clone Virtual Machine wizard: */
    … …  
    3939{
    4040    Q_OBJECT;
    41     // Q_PROPERTY(QString cloneName READ cloneName WRITE setCloneName);
    42     // Q_PROPERTY(QString cloneFilePath READ cloneFilePath WRITE setCloneFilePath);
    43     // Q_PROPERTY(bool linkedClone READ linkedClone);
    44     // Q_PROPERTY(KCloneMode cloneMode READ cloneMode WRITE setCloneMode);
    45     // Q_PROPERTY(MACAddressClonePolicy macAddressClonePolicy READ macAddressClonePolicy WRITE setMACAddressClonePolicy);
    46     // Q_PROPERTY(bool keepDiskNames READ keepDiskNames WRITE setKeepDiskNames);
    47     // Q_PROPERTY(bool keepHWUUIDs READ keepHWUUIDs WRITE setKeepHWUUIDs);
    4841
    4942public:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMTypePageBasic.cpp

    r90739 r90990  
    5959void UIWizardCloneVMTypePageBasic::sltCloneTypeChanged(bool fIsFullClone)
    6060{
    61     UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard());
     61    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
     62    AssertReturnVoid(pWizard);
    6263    m_userModifiedParameters << "LinkedClone";
    63     cloneVMWizardPropertySet(LinkedClone, !fIsFullClone);
     64    pWizard->setLinkedClone(!fIsFullClone);
    6465    /* Show/hide 3rd page according to linked clone toggle: */
    65     AssertReturnVoid(pWizard);
    6666    pWizard->setCloneModePageVisible(fIsFullClone);
    6767}
    … …  
    9191void UIWizardCloneVMTypePageBasic::initializePage()
    9292{
     93    AssertReturnVoid(wizardWindow<UIWizardCloneVM>());
    9394    retranslateUi();
    9495    if (m_pCloneTypeGroupBox && !m_userModifiedParameters.contains("LinkedClone"))
    95         cloneVMWizardPropertySet(LinkedClone, !m_pCloneTypeGroupBox->isFullClone());
     96        wizardWindow<UIWizardCloneVM>()->setLinkedClone(!m_pCloneTypeGroupBox->isFullClone());
    9697}
    9798
    9899bool UIWizardCloneVMTypePageBasic::validatePage()
    99100{
    100     UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard());
     101    UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>();
    101102    AssertReturn(pWizard, false);
    102103

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

    r90739 r90990  
    3131class QIRichTextLabel;
    3232class UICloneVMCloneTypeGroupBox;
     33class UIWizardCloneVM;
    3334
    3435class UIWizardCloneVMTypePageBasic : public UINativeWizardPage

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

    r90401 r90990  
    2929#include "CMedium.h"
    3030#include "CMediumFormat.h"
    31 
    32 #define newVDWizardPropertySet(functionName, value)                      \
    33     do                                                                   \
    34     {                                                                    \
    35         UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard()); \
    36         if (pWizard)                                                     \
    37             pWizard->set##functionName(value);                           \
    38     }                                                                    \
    39     while(0)
    4031
    4132/* New Virtual Hard Drive wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

    r90885 r90990  
    8888void UIWizardNewVDPageExpert::sltMediumSizeChanged(qulonglong uSize)
    8989{
    90     newVDWizardPropertySet(MediumSize, uSize);
     90    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
     91    wizardWindow<UIWizardNewVD>()->setMediumSize(uSize);
    9192    emit completeChanged();
    9293}
    … …  
    9495void UIWizardNewVDPageExpert::sltMediumPathChanged(const QString &strPath)
    9596{
    96     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     97    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    9798    AssertReturnVoid(pWizard);
    9899    QString strMediumPath =
    99100        UIDiskEditorGroupBox::appendExtension(strPath,
    100101                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    101     newVDWizardPropertySet(MediumPath, strMediumPath);
     102    pWizard->setMediumPath(strMediumPath);
    102103    emit completeChanged();
    103104}
    … …  
    105106void UIWizardNewVDPageExpert::sltMediumVariantChanged(qulonglong uVariant)
    106107{
    107     newVDWizardPropertySet(MediumVariant, uVariant);
     108    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
     109    wizardWindow<UIWizardNewVD>()->setMediumVariant(uVariant);
    108110    emit completeChanged();
    109111}
    … …  
    112114{
    113115    AssertReturnVoid(m_pFormatGroup);
    114     newVDWizardPropertySet(MediumFormat, m_pFormatGroup->mediumFormat());
     116    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
     117    wizardWindow<UIWizardNewVD>()->setMediumFormat(m_pFormatGroup->mediumFormat());
    115118    updateDiskWidgetsAfterMediumFormatChange();
    116119    completeChanged();
    … …  
    119122void UIWizardNewVDPageExpert::sltSelectLocationButtonClicked()
    120123{
    121     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     124    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    122125    AssertReturnVoid(pWizard);
    123126    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    … …  
    141144void UIWizardNewVDPageExpert::initializePage()
    142145{
     146    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
     147    AssertReturnVoid(pWizard);
    143148    /* First set the medium format of the wizard: */
    144149    AssertReturnVoid(m_pFormatGroup);
    145150    const CMediumFormat &comMediumFormat = m_pFormatGroup->mediumFormat();
    146151    AssertReturnVoid(!comMediumFormat.isNull());
    147     newVDWizardPropertySet(MediumFormat, comMediumFormat);
     152    pWizard->setMediumFormat(comMediumFormat);
    148153
    149154    QString strExtension = UIDiskFormatsGroupBox::defaultExtension(comMediumFormat, KDeviceType_HardDisk);
    … …  
    154159    m_pSizeAndPathGroup->setMediumPath(strMediumFilePath);
    155160    m_pSizeAndPathGroup->blockSignals(false);
    156     newVDWizardPropertySet(MediumPath, m_pSizeAndPathGroup->mediumPath());
     161    pWizard->setMediumPath(m_pSizeAndPathGroup->mediumPath());
    157162
    158163    m_pSizeAndPathGroup->blockSignals(true);
    159164    m_pSizeAndPathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
    160165    m_pSizeAndPathGroup->blockSignals(false);
    161     newVDWizardPropertySet(MediumSize, m_pSizeAndPathGroup->mediumSize());
     166    pWizard->setMediumSize(m_pSizeAndPathGroup->mediumSize());
    162167
    163168    m_pVariantGroup->blockSignals(true);
    … …  
    165170    m_pVariantGroup->blockSignals(false);
    166171
    167     newVDWizardPropertySet(MediumVariant, m_pVariantGroup->mediumVariant());
     172    pWizard->setMediumVariant(m_pVariantGroup->mediumVariant());
    168173
    169174    retranslateUi();
    … …  
    172177bool UIWizardNewVDPageExpert::isComplete() const
    173178{
    174     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     179    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    175180    AssertReturn(pWizard, false);
    176181    if (pWizard->mediumFormat().isNull())
    … …  
    188193{
    189194    bool fResult = true;
    190     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     195    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    191196    AssertReturn(pWizard, false);
    192197    /* Make sure such file doesn't exist already: */
    … …  
    215220void UIWizardNewVDPageExpert::updateDiskWidgetsAfterMediumFormatChange()
    216221{
    217     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     222    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    218223    AssertReturnVoid(pWizard && m_pVariantGroup && m_pSizeAndPathGroup && m_pFormatGroup);
    219224    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
    … …  
    229234    m_pSizeAndPathGroup->blockSignals(false);
    230235    /* Update the wizard parameters explicitly since we blocked th signals: */
    231     newVDWizardPropertySet(MediumPath, m_pSizeAndPathGroup->mediumPath());
    232     newVDWizardPropertySet(MediumVariant, m_pVariantGroup->mediumVariant());
    233 }
     236    pWizard->setMediumPath(m_pSizeAndPathGroup->mediumPath());
     237    pWizard->setMediumVariant(m_pVariantGroup->mediumVariant());
     238}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.h

    r90669 r90990  
    3030class UIDiskVariantGroupBox;
    3131class UIMediumSizeAndPathGroupBox;
     32class UIWizardNewVD;
    3233
    3334/* Expert page of the New Virtual Hard Drive wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageFileType.cpp

    r90748 r90990  
    5151{
    5252    AssertReturnVoid(m_pFormatButtonGroup);
    53     newVDWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
     53    wizardWindow<UIWizardNewVD>()->setMediumFormat(m_pFormatButtonGroup->mediumFormat());
    5454    emit completeChanged();
    5555}
    … …  
    6666void UIWizardNewVDPageFileType::initializePage()
    6767{
     68    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
    6869    retranslateUi();
    6970    if (m_pFormatButtonGroup)
    70         newVDWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
     71        wizardWindow<UIWizardNewVD>()->setMediumFormat(m_pFormatButtonGroup->mediumFormat());
    7172}
    7273
    7374bool UIWizardNewVDPageFileType::isComplete() const
    7475{
    75     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     76    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    7677    if (pWizard && !pWizard->mediumFormat().isNull())
    7778        return true;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageFileType.h

    r90413 r90990  
    2828class QIRichTextLabel;
    2929class UIDiskFormatsGroupBox;
     30class UIWizardNewVD;
    3031
    3132namespace UIWizardNewVDFileType

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageSizeLocation.cpp

    r90800 r90990  
    5656    pMainLayout->addWidget(m_pMediumSizePathGroup);
    5757    pMainLayout->addStretch();
    58 //     }
    5958    retranslateUi();
    6059}
    … …  
    6261void UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked()
    6362{
    64     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     63    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    6564    AssertReturnVoid(pWizard);
    6665    QString strSelectedPath =
    … …  
    7978void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong uSize)
    8079{
     80    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
    8181    m_userModifiedParameters << "MediumSize";
    82     newVDWizardPropertySet(MediumSize, uSize);
     82    wizardWindow<UIWizardNewVD>()->setMediumSize(uSize);
    8383    emit completeChanged();
    8484}
    … …  
    8686void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &strPath)
    8787{
    88     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     88    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    8989    AssertReturnVoid(pWizard);
    9090    m_userModifiedParameters << "MediumPath";
    … …  
    9292        UIDiskEditorGroupBox::appendExtension(strPath,
    9393                                              UIDiskFormatsGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
    94     newVDWizardPropertySet(MediumPath, strMediumPath);
     94    pWizard->setMediumPath(strMediumPath);
    9595    emit completeChanged();
    9696}
    … …  
    103103void UIWizardNewVDPageSizeLocation::initializePage()
    104104{
    105     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     105    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    106106    AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
    107107
    … …  
    115115        m_pMediumSizePathGroup->setMediumPath(strMediumFilePath);
    116116        m_pMediumSizePathGroup->blockSignals(false);
    117         newVDWizardPropertySet(MediumPath, m_pMediumSizePathGroup->mediumPath());
     117        pWizard->setMediumPath(m_pMediumSizePathGroup->mediumPath());
    118118    }
    119119    if (!m_userModifiedParameters.contains("MediumSize"))
    … …  
    122122        m_pMediumSizePathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
    123123        m_pMediumSizePathGroup->blockSignals(false);
    124         newVDWizardPropertySet(MediumSize, m_pMediumSizePathGroup->mediumSize());
     124        pWizard->setMediumSize(m_pMediumSizePathGroup->mediumSize());
    125125    }
    126126    retranslateUi();
    … …  
    129129bool UIWizardNewVDPageSizeLocation::isComplete() const
    130130{
    131     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     131    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    132132    AssertReturn(pWizard, false);
    133133    if (pWizard->mediumPath().isEmpty())
    … …  
    141141{
    142142    bool fResult = true;
    143     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     143    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    144144    AssertReturn(pWizard, false);
    145145    /* Make sure such file doesn't exist already: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageVariant.cpp

    r90854 r90990  
    8686void UIWizardNewVDPageVariant::initializePage()
    8787{
    88     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     88    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    8989    AssertReturnVoid(pWizard && m_pVariantGroupBox);
    9090    setWidgetVisibility(pWizard->mediumFormat());
    91     newVDWizardPropertySet(MediumVariant, m_pVariantGroupBox->mediumVariant());
     91    pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
    9292    retranslateUi();
    9393}
    … …  
    116116void UIWizardNewVDPageVariant::sltMediumVariantChanged(qulonglong uVariant)
    117117{
    118     newVDWizardPropertySet(MediumVariant, uVariant);
     118    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
     119    wizardWindow<UIWizardNewVD>()->setMediumVariant(uVariant);
    119120}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageVariant.h

    r90407 r90990  
    2929class QIRichTextLabel;
    3030class UIDiskVariantGroupBox;
     31class UIWizardNewVD;
    3132
    3233class SHARED_LIBRARY_STUFF UIWizardNewVDPageVariant : public UINativeWizardPage

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

    r90902 r90990  
    3131#include "CMediumFormat.h"
    3232#include "CGuestOSType.h"
    33 
    34 #define newVMWizardPropertySet(functionName, value)                     \
    35     do                                                                  \
    36     {                                                                   \
    37         UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard()); \
    38         if (pWizard)                                                   \
    39             pWizard->set##functionName(value);                          \
    40     }                                                                   \
    41     while(0)
    4233
    4334/** Container for unattended install related data. */

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

    r90902 r90990  
    158158void UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged()
    159159{
    160     AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
     160    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     161    AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup && pWizard);
    161162    m_userModifiedParameters << "SelectedDiskSource";
    162163    if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
    … …  
    165166    {
    166167        m_enmSelectedDiskSource = SelectedDiskSource_Existing;
    167         newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     168        pWizard->setVirtualDisk(m_pDiskSelector->id());
    168169    }
    169170    else
    … …  
    178179void UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged()
    179180{
    180     AssertReturnVoid(m_pDiskSelector);
     181    AssertReturnVoid(m_pDiskSelector && wizardWindow<UIWizardNewVM>());
    181182    m_userModifiedParameters << "SelectedExistingMediumIndex";
    182     newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     183    wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id());
    183184    emit completeChanged();
    184185}
    … …  
    186187void UIWizardNewVMDiskPageBasic::sltGetWithFileOpenDialog()
    187188{
    188     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     189    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    189190    AssertReturnVoid(pWizard);
    190191    const CGuestOSType &comOSType = pWizard->guestOSType();
    … …  
    246247    retranslateUi();
    247248
    248     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     249    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    249250    AssertReturnVoid(pWizard);
    250251
    … …  
    290291            if (format.GetName() == "VDI")
    291292            {
    292                 newVMWizardPropertySet(MediumFormat, format);
     293                pWizard->setMediumFormat(format);
    293294                m_fVDIFormatFound = true;
    294295            }
    … …  
    306307        UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDefaultName,
    307308                                                                                  strDefaultExtension), strMachineFolder);
    308     newVMWizardPropertySet(MediumPath, strMediumPath);
     309    pWizard->setMediumPath(strMediumPath);
    309310
    310311    /* Set the recommended disk size if user has already not done so: */
    … …  
    314315        m_pMediumSizeEditor->setMediumSize(iRecommendedSize);
    315316        m_pMediumSizeEditor->blockSignals(false);
    316         newVMWizardPropertySet(MediumSize, iRecommendedSize);
     317        pWizard->setMediumSize(iRecommendedSize);
    317318    }
    318319
    … …  
    323324        {
    324325            if (m_pFixedCheckBox->isChecked())
    325                 newVMWizardPropertySet(MediumVariant, (qulonglong)KMediumVariant_Fixed);
     326                pWizard->setMediumVariant((qulonglong)KMediumVariant_Fixed);
    326327            else
    327                 newVMWizardPropertySet(MediumVariant, (qulonglong)KMediumVariant_Standard);
     328                pWizard->setMediumVariant((qulonglong)KMediumVariant_Standard);
    328329        }
    329330        else
    330             newVMWizardPropertySet(MediumVariant, (qulonglong)KMediumVariant_Standard);
     331            pWizard->setMediumVariant((qulonglong)KMediumVariant_Standard);
    331332    }
    332333}
    … …  
    334335bool UIWizardNewVMDiskPageBasic::isComplete() const
    335336{
    336     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     337    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    337338    AssertReturn(pWizard, false);
    338339
    … …  
    350351{
    351352    bool fResult = true;
    352     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     353    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    353354    AssertReturn(pWizard, false);
    354355
    … …  
    406407void UIWizardNewVMDiskPageBasic::sltHandleSizeEditorChange(qulonglong uSize)
    407408{
    408     newVMWizardPropertySet(MediumSize, uSize);
     409    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     410    wizardWindow<UIWizardNewVM>()->setMediumSize(uSize);
    409411    m_userModifiedParameters << "MediumSize";
    410412    emit completeChanged();
    … …  
    413415void UIWizardNewVMDiskPageBasic::sltFixedCheckBoxToggled(bool fChecked)
    414416{
     417    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    415418    qulonglong uMediumVariant = (qulonglong)KMediumVariant_Max;
    416419    if (fChecked)
    … …  
    418421    else
    419422        uMediumVariant = (qulonglong)KMediumVariant_Standard;
    420     newVMWizardPropertySet(MediumVariant, uMediumVariant);
     423    wizardWindow<UIWizardNewVM>()->setMediumVariant(uMediumVariant);
    421424    m_userModifiedParameters << "MediumVariant";
    422425}

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

    r90413 r90990  
    7878    retranslateUi();
    7979
    80     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     80    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    8181    if (pWizard && m_pHardwareWidgetContainer)
    8282    {
    … …  
    110110void UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged(int iValue)
    111111{
    112     newVMWizardPropertySet(MemorySize, iValue);
     112    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     113    wizardWindow<UIWizardNewVM>()->setMemorySize(iValue);
    113114    m_userModifiedParameters << "MemorySize";
    114115}
    … …  
    116117void UIWizardNewVMHardwarePageBasic::sltCPUCountChanged(int iCount)
    117118{
    118     newVMWizardPropertySet(CPUCount, iCount);
     119    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     120    wizardWindow<UIWizardNewVM>()->setCPUCount(iCount);
    119121}
    120122
    121123void UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged(bool fEnabled)
    122124{
    123     newVMWizardPropertySet(EFIEnabled, fEnabled);
     125    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     126    wizardWindow<UIWizardNewVM>()->setEFIEnabled(fEnabled);
    124127    m_userModifiedParameters << "EFIEnabled";
    125128}

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

    r90413 r90990  
    3131class QIRichTextLabel;
    3232class UINewVMHardwareContainer;
     33class UIWizardNewVM;
    3334
    3435namespace UIWizardNewVMHardwarePage

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

    r90413 r90990  
    363363void UIWizardNewVMNameOSTypePageBasic::sltNameChanged(const QString &strNewName)
    364364{
     365    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    365366    if (!m_userModifiedParameters.contains("GuestOSType"))
    366367    {
    367368        m_pNameAndSystemEditor->blockSignals(true);
    368369        if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
    369             newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     370            wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    370371        m_pNameAndSystemEditor->blockSignals(false);
    371372    }
    372     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     373    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    373374    emit completeChanged();
    374375}
    … …  
    377378{
    378379    Q_UNUSED(strNewPath);
    379     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     380    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    380381}
    381382
    382383void UIWizardNewVMNameOSTypePageBasic::sltOsTypeChanged()
    383384{
     385    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    384386    m_userModifiedParameters << "GuestOSType";
    385387    if (m_pNameAndSystemEditor)
    386         newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     388        wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    387389}
    388390
    … …  
    410412void UIWizardNewVMNameOSTypePageBasic::initializePage()
    411413{
     414    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     415    AssertReturnVoid(pWizard);
     416
    412417    retranslateUi();
    413418
    … …  
    423428        if (m_pNameAndSystemEditor)
    424429        {
    425             newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
    426             newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     430            pWizard->setGuestOSFamilyId(m_pNameAndSystemEditor->familyId());
     431            pWizard->setGuestOSType(m_pNameAndSystemEditor->type());
    427432            /* Vm name, folder, file path etc. will be initilized by composeMachineFilePath: */
    428433        }
    … …  
    433438}
    434439
    435 // void UIWizardNewVMNameOSTypePageBasic::cleanupPage()
    436 // {
    437 //     cleanupMachineFolder();
    438 //     /* Call to base-class: */
    439 //     UIWizardPage::cleanupPage();
    440 // }
    441 
    442440bool UIWizardNewVMNameOSTypePageBasic::validatePage()
    443441{
    444442    /* Try to create machine folder: */
    445     return UIWizardNewVMNameOSTypePage::createMachineFolder(m_pNameAndSystemEditor, this, qobject_cast<UIWizardNewVM*>(wizard()));
     443    return UIWizardNewVMNameOSTypePage::createMachineFolder(m_pNameAndSystemEditor, this, wizardWindow<UIWizardNewVM>());
    446444}
    447445
    … …  
    466464void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId)
    467465{
    468     newVMWizardPropertySet(GuestOSFamilyId, strGuestOSFamilyId);
     466    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     467    wizardWindow<UIWizardNewVM>()->setGuestOSFamilyId(strGuestOSFamilyId);
    469468}
    470469
    471470void UIWizardNewVMNameOSTypePageBasic::sltSkipUnattendedInstallChanged(bool fSkip)
    472471{
     472    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    473473    m_userModifiedParameters << "SkipUnattendedInstall";
    474     newVMWizardPropertySet(SkipUnattendedInstall, fSkip);
     474    wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(fSkip);
    475475}
    476476

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

    r90885 r90990  
    8484void UIWizardNewVMPageExpert::sltNameChanged(const QString &strNewName)
    8585{
     86    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    8687    if (!m_userModifiedParameters.contains("GuestOSType") && m_pNameAndSystemEditor)
    8788    {
    … …  
    8990        if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
    9091        {
    91             newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     92            wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    9293            /* Since the type `possibly` changed: */
    9394            setOSTypeDependedValues();
    … …  
    9596        m_pNameAndSystemEditor->blockSignals(false);
    9697    }
    97     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     98    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    9899    if (!m_userModifiedParameters.contains("MediumPath"))
    99100        updateVirtualMediumPathFromMachinePathName();
    … …  
    106107{
    107108    Q_UNUSED(strNewPath);
    108     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     109    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, wizardWindow<UIWizardNewVM>());
    109110    if (!m_userModifiedParameters.contains("MediumPath"))
    110111        updateVirtualMediumPathFromMachinePathName();
    … …  
    113114void UIWizardNewVMPageExpert::sltOsTypeChanged()
    114115{
     116    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    115117    m_userModifiedParameters << "GuestOSType";
    116118    if (m_pNameAndSystemEditor)
    117         newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     119        wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
    118120    setOSTypeDependedValues();
    119121}
    … …  
    121123void UIWizardNewVMPageExpert::sltGetWithFileOpenDialog()
    122124{
    123     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     125    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    124126    AssertReturnVoid(pWizard);
    125127    const CGuestOSType &comOSType = pWizard->guestOSType();
    … …  
    138140void UIWizardNewVMPageExpert::sltISOPathChanged(const QString &strISOPath)
    139141{
    140     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     142    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    141143    AssertReturnVoid(pWizard);
    142144
    … …  
    145147    if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
    146148            UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
    147     newVMWizardPropertySet(ISOFilePath, strISOPath);
     149    pWizard->setISOFilePath(strISOPath);
    148150
    149151    /* Update the global recent ISO path: */
    … …  
    158160void UIWizardNewVMPageExpert::sltGAISOPathChanged(const QString &strPath)
    159161{
     162    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    160163    m_userModifiedParameters << "GuestAdditionsISOPath";
    161     newVMWizardPropertySet(GuestAdditionsISOPath, strPath);
     164    wizardWindow<UIWizardNewVM>()->setGuestAdditionsISOPath(strPath);
    162165    emit completeChanged();
    163166}
    … …  
    165168void UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle(bool fEnabled)
    166169{
    167     newVMWizardPropertySet(InstallGuestAdditions, fEnabled);
     170    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     171    wizardWindow<UIWizardNewVM>()->setInstallGuestAdditions(fEnabled);
    168172    m_userModifiedParameters << "InstallGuestAdditions";
    169173    emit completeChanged();
    … …  
    172176void UIWizardNewVMPageExpert::sltOSFamilyTypeChanged(const QString &strGuestOSFamilyType)
    173177{
     178    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    174179    if (m_pAdditionalOptionsContainer)
    175180        m_pAdditionalOptionsContainer->disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
    176181    m_userModifiedParameters << "GuestOSFamilyId";
    177     newVMWizardPropertySet(GuestOSFamilyId, strGuestOSFamilyType);
     182    wizardWindow<UIWizardNewVM>()->setGuestOSFamilyId(strGuestOSFamilyType);
    178183}
    179184
    … …  
    300305void UIWizardNewVMPageExpert::setOSTypeDependedValues()
    301306{
    302     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     307    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    303308    AssertReturnVoid(pWizard);
    304309
    … …  
    349354    {
    350355        m_pSizeAndLocationGroup->setMediumSize(iRecommendedDiskSize);
    351         newVMWizardPropertySet(MediumSize, iRecommendedDiskSize);
    352     }
    353 
    354     // if (m_pProductKeyLabel)
    355     //     m_pProductKeyLabel->setEnabled(isProductKeyWidgetEnabled());
    356     // if (m_pProductKeyLineEdit)
    357     //     m_pProductKeyLineEdit->setEnabled(isProductKeyWidgetEnabled());
     356        pWizard->setMediumSize(iRecommendedDiskSize);
     357    }
    358358}
    359359
    … …  
    362362    /* We need not to check existence of parameter within m_userModifiedParameters since initializePage() runs
    363363        once the page loads before user has a chance to modify parameters explicitly: */
    364     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     364    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    365365    AssertReturnVoid(pWizard);
    366366    /* Initialize wizard properties: */
    … …  
    369369        {
    370370            /* Guest OS type: */
    371             newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
    372             newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
     371            pWizard->setGuestOSFamilyId(m_pNameAndSystemEditor->familyId());
     372            pWizard->setGuestOSType(m_pNameAndSystemEditor->type());
    373373            /* Vm name, folder, file path etc. will be initilized by composeMachineFilePath: */
    374374        }
    … …  
    376376        /* Medium related properties: */
    377377        if (m_pFormatButtonGroup)
    378             newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
     378            pWizard->setMediumFormat(m_pFormatButtonGroup->mediumFormat());
    379379        updateVirtualMediumPathFromMachinePathName();
    380380    }
    … …  
    418418                                                UIWizardNewVM::tr("Invalid file path or unreadable file"));
    419419    }
    420     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     420    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    421421    if (pWizard && pWizard->installGuestAdditions() && m_pGAInstallationISOContainer)
    422422        m_pGAInstallationISOContainer->mark();
    … …  
    508508    m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Hardware, QIcon());
    509509
    510     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     510    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    511511    AssertReturn(pWizard, false);
    512512
    … …  
    595595bool UIWizardNewVMPageExpert::validatePage()
    596596{
    597     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     597    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    598598    AssertReturn(pWizard, false);
    599599    bool fResult = true;
    … …  
    639639bool UIWizardNewVMPageExpert::isProductKeyWidgetEnabled() const
    640640{
    641     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     641    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    642642    if (!pWizard || !isUnattendedEnabled() || !pWizard->isGuestOSTypeWindows())
    643643        return false;
    … …  
    658658void UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked(bool fSkip)
    659659{
     660    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    660661    m_userModifiedParameters << "SkipUnattendedInstall";
    661     newVMWizardPropertySet(SkipUnattendedInstall, fSkip);
     662    wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(fSkip);
    662663    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
    663664    emit completeChanged();
    … …  
    666667void UIWizardNewVMPageExpert::sltMediumFormatChanged()
    667668{
     669    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    668670    if (!m_pFormatButtonGroup)
    669671        return;
    670672
    671673    m_userModifiedParameters << "MediumFormat";
    672     newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
     674    wizardWindow<UIWizardNewVM>()->setMediumFormat(m_pFormatButtonGroup->mediumFormat());
    673675    updateDiskWidgetsAfterMediumFormatChange();
    674676    emit completeChanged();
    … …  
    677679void UIWizardNewVMPageExpert::sltMediumSizeChanged(qulonglong uSize)
    678680{
     681    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    679682    m_userModifiedParameters << "MediumSize";
    680     newVMWizardPropertySet(MediumSize, uSize);
     683    wizardWindow<UIWizardNewVM>()->setMediumSize(uSize);
    681684    emit completeChanged();
    682685}
    … …  
    684687void UIWizardNewVMPageExpert::sltMediumPathChanged(const QString &strPath)
    685688{
     689    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    686690    m_userModifiedParameters << "MediumPath";
    687     newVMWizardPropertySet(MediumPath, strPath);
     691    wizardWindow<UIWizardNewVM>()->setMediumPath(strPath);
    688692    emit completeChanged();
    689693}
    … …  
    691695void UIWizardNewVMPageExpert::sltMediumLocationButtonClicked()
    692696{
    693     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     697    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    694698    AssertReturnVoid(pWizard);
    695699    CMediumFormat comMediumFormat(pWizard->mediumFormat());
    … …  
    707711void UIWizardNewVMPageExpert::sltMediumVariantChanged(qulonglong uVariant)
    708712{
     713    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    709714    m_userModifiedParameters << "MediumVariant";
    710     newVMWizardPropertySet(MediumVariant, uVariant);
     715    wizardWindow<UIWizardNewVM>()->setMediumVariant(uVariant);
    711716}
    712717
    713718void UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged()
    714719{
     720    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    715721    AssertReturnVoid(m_pDiskSelector);
    716722    /* Make sure to set m_virtualDisk: */
    717     newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     723    wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id());
    718724    emit completeChanged();
    719725}
    … …  
    722728{
    723729    AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
    724 
     730    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    725731    m_userModifiedParameters << "SelectedDiskSource";
    726732    if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
    … …  
    729735    {
    730736        m_enmSelectedDiskSource = SelectedDiskSource_Existing;
    731         newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     737        wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id());
    732738    }
    733739    else
    … …  
    742748void UIWizardNewVMPageExpert::sltMemorySizeChanged(int iValue)
    743749{
    744     newVMWizardPropertySet(MemorySize, iValue);
     750    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     751    wizardWindow<UIWizardNewVM>()->setMemorySize(iValue);
    745752    m_userModifiedParameters << "MemorySize";
    746753}
    … …  
    748755void UIWizardNewVMPageExpert::sltCPUCountChanged(int iCount)
    749756{
    750     newVMWizardPropertySet(CPUCount, iCount);
     757    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     758    wizardWindow<UIWizardNewVM>()->setCPUCount(iCount);
    751759}
    752760
    753761void UIWizardNewVMPageExpert::sltEFIEnabledChanged(bool fEnabled)
    754762{
    755     newVMWizardPropertySet(EFIEnabled, fEnabled);
     763    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     764    wizardWindow<UIWizardNewVM>()->setEFIEnabled(fEnabled);
    756765    m_userModifiedParameters << "EFIEnabled";
    757766}
    … …  
    759768void UIWizardNewVMPageExpert::sltPasswordChanged(const QString &strPassword)
    760769{
    761     newVMWizardPropertySet(Password, strPassword);
     770    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     771    wizardWindow<UIWizardNewVM>()->setPassword(strPassword);
    762772    m_userModifiedParameters << "Password";
    763773    emit completeChanged();
    … …  
    766776void UIWizardNewVMPageExpert::sltUserNameChanged(const QString &strUserName)
    767777{
    768     newVMWizardPropertySet(UserName, strUserName);
     778    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     779    wizardWindow<UIWizardNewVM>()->setUserName(strUserName);
    769780    m_userModifiedParameters << "UserName";
    770781    emit completeChanged();
    … …  
    773784void UIWizardNewVMPageExpert::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
    774785{
    775     newVMWizardPropertySet(HostnameDomainName, strHostnameDomainName);
     786    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     787    wizardWindow<UIWizardNewVM>()->setHostnameDomainName(strHostnameDomainName);
    776788    m_userModifiedParameters << "HostnameDomainName";
    777789    emit completeChanged();
    … …  
    780792void UIWizardNewVMPageExpert::sltProductKeyChanged(const QString &strProductKey)
    781793{
     794    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    782795    m_userModifiedParameters << "ProductKey";
    783     newVMWizardPropertySet(ProductKey, strProductKey);
     796    wizardWindow<UIWizardNewVM>()->setProductKey(strProductKey);
    784797}
    785798
    786799void UIWizardNewVMPageExpert::sltStartHeadlessChanged(bool fStartHeadless)
    787800{
     801    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    788802    m_userModifiedParameters << "StartHeadless";
    789     newVMWizardPropertySet(StartHeadless, fStartHeadless);
    790 }
    791 
     803    wizardWindow<UIWizardNewVM>()->setStartHeadless(fStartHeadless);
     804}
    792805
    793806void UIWizardNewVMPageExpert::updateVirtualMediumPathFromMachinePathName()
    794807{
    795     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     808    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    796809    AssertReturnVoid(pWizard);
    797810    QString strDiskFileName = pWizard->machineBaseName().isEmpty() ? QString("NewVirtualDisk1") : pWizard->machineBaseName();
    … …  
    813826        m_pSizeAndLocationGroup->setMediumPath(strMediumFilePath);
    814827        m_pSizeAndLocationGroup->blockSignals(false);
    815         newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
     828        pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumPath());
    816829    }
    817830}
    … …  
    819832void UIWizardNewVMPageExpert::updateDiskWidgetsAfterMediumFormatChange()
    820833{
    821     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     834    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    822835    AssertReturnVoid(pWizard && m_pDiskVariantGroupBox && m_pSizeAndLocationGroup && m_pFormatButtonGroup);
    823836    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
    … …  
    833846    m_pSizeAndLocationGroup->blockSignals(false);
    834847    /* Update the wizard parameters explicitly since we blocked th signals: */
    835     newVMWizardPropertySet(MediumPath, m_pSizeAndLocationGroup->mediumPath());
    836     newVMWizardPropertySet(MediumVariant, m_pDiskVariantGroupBox->mediumVariant());
     848    pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumPath());
     849pWizard->setMediumVariant(m_pDiskVariantGroupBox->mediumVariant());
    837850}
    838851
    … …  
    883896    if (!m_pAdditionalOptionsContainer)
    884897        return;
    885     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     898    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    886899    AssertReturnVoid(pWizard);
    887900
    … …  
    890903    m_pAdditionalOptionsContainer->setDomainName("myguest.virtualbox.org");
    891904    /* Initialize unattended hostname here since we cannot get the default value from CUnattended this early (unlike username etc): */
    892     newVMWizardPropertySet(HostnameDomainName, m_pAdditionalOptionsContainer->hostnameDomainName());
     905    pWizard->setHostnameDomainName(m_pAdditionalOptionsContainer->hostnameDomainName());
    893906
    894907    m_pAdditionalOptionsContainer->blockSignals(false);
    … …  
    897910bool UIWizardNewVMPageExpert::isUnattendedEnabled() const
    898911{
    899     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     912    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    900913    AssertReturn(pWizard, false);
    901914    return pWizard->isUnattendedEnabled();

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

    r90413 r90990  
    2929#include "UIWizardNewVMDiskPageBasic.h"
    3030
    31 // #include "COMEnums.h"
    32 // #include "CMediumFormat.h"
    33 
    3431/* Forward declarations: */
    3532class QButtonGroup;
    … …  
    4845class UIToolBox;
    4946class UIUserNamePasswordGroupBox;
     47class UIWizardNewVM;
    5048
    5149/** Expert page of the New Virtual Machine wizard. */

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

    r90413 r90990  
    117117    retranslateUi();
    118118
    119     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     119    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    120120    AssertReturnVoid(pWizard);
    121121    /* Initialize user/password if they are not modified by the user: */
    … …  
    138138            m_pAdditionalOptionsContainer->setDomainName("myguest.virtualbox.org");
    139139            /* Initialize unattended hostname here since we cannot get the efault value from CUnattended this early (unlike username etc): */
    140             newVMWizardPropertySet(HostnameDomainName, m_pAdditionalOptionsContainer->hostnameDomainName());
     140            pWizard->setHostnameDomainName(m_pAdditionalOptionsContainer->hostnameDomainName());
    141141        }
    142142        m_pAdditionalOptionsContainer->blockSignals(false);
    … …  
    160160{
    161161    markWidgets();
    162     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     162    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    163163    if (pWizard && pWizard->installGuestAdditions() &&
    164164        m_pGAInstallationISOContainer &&
    … …  
    183183void UIWizardNewVMUnattendedPageBasic::sltInstallGACheckBoxToggle(bool fEnabled)
    184184{
    185     newVMWizardPropertySet(InstallGuestAdditions, fEnabled);
     185    wizardWindow<UIWizardNewVM>()->setInstallGuestAdditions(fEnabled);
    186186    m_userModifiedParameters << "InstallGuestAdditions";
    187187    emit completeChanged();
    … …  
    190190void UIWizardNewVMUnattendedPageBasic::sltGAISOPathChanged(const QString &strPath)
    191191{
    192     newVMWizardPropertySet(GuestAdditionsISOPath, strPath);
     192    wizardWindow<UIWizardNewVM>()->setGuestAdditionsISOPath(strPath);
    193193    m_userModifiedParameters << "GuestAdditionsISOPath";
    194194    emit completeChanged();
    … …  
    197197void UIWizardNewVMUnattendedPageBasic::sltPasswordChanged(const QString &strPassword)
    198198{
    199     newVMWizardPropertySet(Password, strPassword);
     199    wizardWindow<UIWizardNewVM>()->setPassword(strPassword);
    200200    m_userModifiedParameters << "Password";
    201201    emit completeChanged();
    … …  
    204204void UIWizardNewVMUnattendedPageBasic::sltUserNameChanged(const QString &strUserName)
    205205{
    206     newVMWizardPropertySet(UserName, strUserName);
     206    wizardWindow<UIWizardNewVM>()->setUserName(strUserName);
    207207    m_userModifiedParameters << "UserName";
    208208    emit completeChanged();
    … …  
    211211bool UIWizardNewVMUnattendedPageBasic::isProductKeyWidgetEnabled() const
    212212{
    213     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     213    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    214214    if (!pWizard || !pWizard->isUnattendedEnabled() || !pWizard->isGuestOSTypeWindows())
    215215        return false;
    … …  
    219219void UIWizardNewVMUnattendedPageBasic::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
    220220{
    221     newVMWizardPropertySet(HostnameDomainName, strHostnameDomainName);
     221    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     222    wizardWindow<UIWizardNewVM>()->setHostnameDomainName(strHostnameDomainName);
    222223    m_userModifiedParameters << "HostnameDomainName";
    223224    emit completeChanged();
    … …  
    226227void UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged(const QString &strProductKey)
    227228{
     229    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    228230    m_userModifiedParameters << "ProductKey";
    229     newVMWizardPropertySet(ProductKey, strProductKey);
     231    wizardWindow<UIWizardNewVM>()->setProductKey(strProductKey);
    230232}
    231233
    … …  
    233235{
    234236    m_userModifiedParameters << "StartHeadless";
    235     newVMWizardPropertySet(StartHeadless, fStartHeadless);
     237    wizardWindow<UIWizardNewVM>()->setStartHeadless(fStartHeadless);
    236238}
    237239
    238240void UIWizardNewVMUnattendedPageBasic::markWidgets() const
    239241{
    240     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     242    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
     243    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    241244    if (pWizard && pWizard->installGuestAdditions() && m_pGAInstallationISOContainer)
    242245        m_pGAInstallationISOContainer->mark();

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

    r90413 r90990  
    3030class UIGAInstallationGroupBox;
    3131class UIUserNamePasswordGroupBox;
     32class UIWizardNewVM;
    3233
    3334namespace UIWizardNewVMUnattendedPage
Note: See TracChangeset for help on using the changeset viewer.

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