VirtualBox

Changeset 7467 in vbox


Ignore:
Timestamp:
Mar 17, 2008 7:44:00 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
28906
Message:

FE/Qt4: Simplifications.

Location:
trunk/src/VBox/Frontends/VirtualBox4
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r7447 r7467  
    392392        include/QIMessageBox.h \
    393393        include/QIRichLabel.h \
    394         include/QIAbstractWizardFramework.h \
     394        include/QIAbstractWizard.h \
    395395        include/VBoxGlobalSettings.h \
    396396        include/VBoxUtils.h \
    … …  
    462462        src/QIMessageBox.cpp \
    463463        src/QIRichLabel.cpp \
    464         src/QIAbstractWizardFramework.cpp \
     464        src/QIAbstractWizard.cpp \
    465465        src/VBoxDefs.cpp \
    466466        src/VBoxGlobalSettings.cpp \

  • trunk/src/VBox/Frontends/VirtualBox4/include/VBoxMediaComboBox.h

    r7447 r7467  
    3434public:
    3535
    36     VBoxMediaComboBox (QWidget *aParent, const char *aName,
    37                        int aType = 0, bool aUseEmptyItem = false);
    38     VBoxMediaComboBox (QWidget *aParent);
     36    VBoxMediaComboBox (QWidget *aParent, int aType = -1,
     37                       bool aUseEmptyItem = false);
    3938    ~VBoxMediaComboBox() {}
    4039

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxMediaComboBox.cpp

    r7447 r7467  
    2929#include <QPixmap>
    3030
    31 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent, const char *aName,
    32                                       int aType, bool aUseEmptyItem)
    33     : QComboBox (aParent , aName),
     31VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent, int aType /* = -1 */,
     32                                      bool aUseEmptyItem /* = false */)
     33    : QComboBox (aParent),
    3434    mType (aType), mRequiredId (QUuid()), mUseEmptyItem (aUseEmptyItem)
    35 {
    36     init();
    37 }
    38 
    39 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent)
    40     : QComboBox (aParent),
    41     mType (-1), mRequiredId (QUuid()), mUseEmptyItem (false)
    4235{
    4336    init();

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui

    r7447 r7467  
    931931   <class>QILabel</class>
    932932   <extends>QLabel</extends>
    933    <header>QIAbstractWizardFramework.h</header>
     933   <header>QIAbstractWizard.h</header>
    934934  </customwidget>
    935935  <customwidget>
    936936   <class>QITextEdit</class>
    937937   <extends>QTextEdit</extends>
    938    <header>QIAbstractWizardFramework.h</header>
     938   <header>QIAbstractWizard.h</header>
    939939  </customwidget>
    940940 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui

    r7447 r7467  
    11961196   <class>QILabel</class>
    11971197   <extends>QLabel</extends>
    1198    <header>QIAbstractWizardFramework.h</header>
     1198   <header>QIAbstractWizard.h</header>
    11991199  </customwidget>
    12001200  <customwidget>
    … …  
    12061206   <class>QITextEdit</class>
    12071207   <extends>QTextEdit</extends>
    1208    <header>QIAbstractWizardFramework.h</header>
     1208   <header>QIAbstractWizard.h</header>
    12091209  </customwidget>
    12101210 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMFirstRunWzd.ui

    r7447 r7467  
    832832   <class>QILabel</class>
    833833   <extends>QLabel</extends>
    834    <header>QIAbstractWizardFramework.h</header>
     834   <header>QIAbstractWizard.h</header>
    835835  </customwidget>
    836836  <customwidget>
    … …  
    842842   <class>QITextEdit</class>
    843843   <extends>QTextEdit</extends>
    844    <header>QIAbstractWizardFramework.h</header>
     844   <header>QIAbstractWizard.h</header>
    845845  </customwidget>
    846846 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui.h

    r7466 r7467  
    604604                     tr ("When checked, attaches the specified virtual hard disk to the "
    605605                         "Slave slot of the Secondary IDE controller."));
    606     cbHDA = new VBoxMediaComboBox (grbHDA, "cbHDA", VBoxDefs::HD);
    607     cbHDB = new VBoxMediaComboBox (grbHDB, "cbHDB", VBoxDefs::HD);
    608     cbHDD = new VBoxMediaComboBox (grbHDD, "cbHDD", VBoxDefs::HD);
     606    cbHDA = new VBoxMediaComboBox (grbHDA, VBoxDefs::HD);
     607    cbHDB = new VBoxMediaComboBox (grbHDB, VBoxDefs::HD);
     608    cbHDD = new VBoxMediaComboBox (grbHDD, VBoxDefs::HD);
    609609#warning port me
    610610//    hdaLayout->insertWidget (0, cbHDA);
    … …  
    660660                         "virtual machine. Note that the CD/DVD drive is always connected to the "
    661661                         "Secondary Master IDE controller of the machine."));
    662     cbISODVD = new VBoxMediaComboBox (bgDVD, "cbISODVD", VBoxDefs::CD);
     662    cbISODVD = new VBoxMediaComboBox (bgDVD, VBoxDefs::CD);
    663663#warning port me
    664664//    cdLayout->insertWidget(0, cbISODVD);
    … …  
    687687                     tr ("When checked, mounts the specified media to the Floppy drive of the "
    688688                         "virtual machine."));
    689     cbISOFloppy = new VBoxMediaComboBox (bgFloppy, "cbISOFloppy", VBoxDefs::FD);
     689    cbISOFloppy = new VBoxMediaComboBox (bgFloppy, VBoxDefs::FD);
    690690#warning port me
    691691//    fdLayout->insertWidget(0, cbISOFloppy);
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