VirtualBox

Changeset 72109 in vbox for trunk/src/VBox


Ignore:
Timestamp:
May 4, 2018 11:40:15 AM (7 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9049: Just move the Machine Settings stuff to VBoxGlobal library, no cleanup since it planned later.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r72107 r72109  
    520520        src/selector/graphics/details/UIGDetailsElements.h \
    521521        src/selector/graphics/details/UIGMachinePreview.h \
    522         src/settings/machine/UIMachineSettingsAudio.h \
    523         src/settings/machine/UIMachineSettingsDisplay.h \
    524         src/settings/machine/UIMachineSettingsGeneral.h \
    525         src/settings/machine/UIMachineSettingsInterface.h \
    526         src/settings/machine/UIMachineSettingsNetwork.h \
    527         src/settings/machine/UIMachineSettingsPortForwardingDlg.h \
    528         src/settings/machine/UIMachineSettingsSF.h \
    529         src/settings/machine/UIMachineSettingsSFDetails.h \
    530         src/settings/machine/UIMachineSettingsSerial.h \
    531         src/settings/machine/UIMachineSettingsStorage.h \
    532         src/settings/machine/UIMachineSettingsSystem.h \
    533         src/settings/machine/UIMachineSettingsUSB.h \
    534         src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
    535522        src/widgets/UIApplianceEditorWidget.h \
    536523        src/widgets/UIApplianceExportEditorWidget.h \
    … …  
    658645        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
    659646        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
     647        src/settings/machine/UIMachineSettingsAudio.h \
     648        src/settings/machine/UIMachineSettingsDisplay.h \
     649        src/settings/machine/UIMachineSettingsGeneral.h \
     650        src/settings/machine/UIMachineSettingsInterface.h \
     651        src/settings/machine/UIMachineSettingsNetwork.h \
     652        src/settings/machine/UIMachineSettingsPortForwardingDlg.h \
     653        src/settings/machine/UIMachineSettingsSF.h \
     654        src/settings/machine/UIMachineSettingsSFDetails.h \
     655        src/settings/machine/UIMachineSettingsSerial.h \
     656        src/settings/machine/UIMachineSettingsStorage.h \
     657        src/settings/machine/UIMachineSettingsSystem.h \
     658        src/settings/machine/UIMachineSettingsUSB.h \
     659        src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
    660660        src/widgets/UIAddDiskEncryptionPasswordDialog.h \
    661661        src/widgets/UIBootTable.h \
    … …  
    786786        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
    787787        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
     788        src/settings/machine/UIMachineSettingsAudio.h \
     789        src/settings/machine/UIMachineSettingsDisplay.h \
     790        src/settings/machine/UIMachineSettingsGeneral.h \
     791        src/settings/machine/UIMachineSettingsInterface.h \
     792        src/settings/machine/UIMachineSettingsNetwork.h \
     793        src/settings/machine/UIMachineSettingsPortForwardingDlg.h \
     794        src/settings/machine/UIMachineSettingsSF.h \
     795        src/settings/machine/UIMachineSettingsSFDetails.h \
     796        src/settings/machine/UIMachineSettingsSerial.h \
     797        src/settings/machine/UIMachineSettingsStorage.h \
     798        src/settings/machine/UIMachineSettingsSystem.h \
     799        src/settings/machine/UIMachineSettingsUSB.h \
     800        src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
    788801        src/widgets/UIAddDiskEncryptionPasswordDialog.h \
    789802        src/widgets/UIBootTable.h \
    … …  
    861874        src/selector/UISnapshotDetailsWidget.cpp \
    862875        src/selector/UISnapshotPane.cpp \
    863         src/settings/machine/UIMachineSettingsNetwork.cpp \
    864         src/settings/machine/UIMachineSettingsSerial.cpp \
    865         src/settings/machine/UIMachineSettingsStorage.cpp \
    866         src/settings/machine/UIMachineSettingsUSB.cpp \
    867876        src/widgets/UIMenuToolBar.cpp \
    868877        src/widgets/UIMiniToolBar.cpp \
    … …  
    887896        src/selector/UIVirtualBoxEventHandler.cpp \
    888897        src/settings/global/UIGlobalSettingsInput.cpp \
     898        src/settings/machine/UIMachineSettingsNetwork.cpp \
     899        src/settings/machine/UIMachineSettingsSerial.cpp \
     900        src/settings/machine/UIMachineSettingsStorage.cpp \
     901        src/settings/machine/UIMachineSettingsUSB.cpp \
    889902        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    890903        src/widgets/UIFilmContainer.cpp \
    … …  
    931944        src/selector/UIVirtualBoxEventHandler.cpp \
    932945        src/settings/global/UIGlobalSettingsInput.cpp \
     946        src/settings/machine/UIMachineSettingsNetwork.cpp \
     947        src/settings/machine/UIMachineSettingsSerial.cpp \
     948        src/settings/machine/UIMachineSettingsStorage.cpp \
     949        src/settings/machine/UIMachineSettingsUSB.cpp \
    933950        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    934951        src/widgets/UIFilmContainer.cpp \
    … …  
    10461063        src/selector/graphics/details/UIGDetailsElements.cpp \
    10471064        src/selector/graphics/details/UIGMachinePreview.cpp \
    1048         src/settings/machine/UIMachineSettingsAudio.cpp \
    1049         src/settings/machine/UIMachineSettingsDisplay.cpp \
    1050         src/settings/machine/UIMachineSettingsGeneral.cpp \
    1051         src/settings/machine/UIMachineSettingsInterface.cpp \
    1052         src/settings/machine/UIMachineSettingsNetwork.cpp \
    1053         src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
    1054         src/settings/machine/UIMachineSettingsSF.cpp \
    1055         src/settings/machine/UIMachineSettingsSFDetails.cpp \
    1056         src/settings/machine/UIMachineSettingsSerial.cpp \
    1057         src/settings/machine/UIMachineSettingsStorage.cpp \
    1058         src/settings/machine/UIMachineSettingsSystem.cpp \
    1059         src/settings/machine/UIMachineSettingsUSB.cpp \
    1060         src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
    10611065        src/widgets/UIApplianceEditorWidget.cpp \
    10621066        src/widgets/UIApplianceExportEditorWidget.cpp \
    … …  
    12251229        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
    12261230        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
     1231        src/settings/machine/UIMachineSettingsAudio.cpp \
     1232        src/settings/machine/UIMachineSettingsDisplay.cpp \
     1233        src/settings/machine/UIMachineSettingsGeneral.cpp \
     1234        src/settings/machine/UIMachineSettingsInterface.cpp \
     1235        src/settings/machine/UIMachineSettingsNetwork.cpp \
     1236        src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
     1237        src/settings/machine/UIMachineSettingsSF.cpp \
     1238        src/settings/machine/UIMachineSettingsSFDetails.cpp \
     1239        src/settings/machine/UIMachineSettingsSerial.cpp \
     1240        src/settings/machine/UIMachineSettingsStorage.cpp \
     1241        src/settings/machine/UIMachineSettingsSystem.cpp \
     1242        src/settings/machine/UIMachineSettingsUSB.cpp \
     1243        src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
    12271244        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    12281245        src/widgets/UIBootTable.cpp \
    … …  
    13801397        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
    13811398        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
     1399        src/settings/machine/UIMachineSettingsAudio.cpp \
     1400        src/settings/machine/UIMachineSettingsDisplay.cpp \
     1401        src/settings/machine/UIMachineSettingsGeneral.cpp \
     1402        src/settings/machine/UIMachineSettingsInterface.cpp \
     1403        src/settings/machine/UIMachineSettingsNetwork.cpp \
     1404        src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
     1405        src/settings/machine/UIMachineSettingsSF.cpp \
     1406        src/settings/machine/UIMachineSettingsSFDetails.cpp \
     1407        src/settings/machine/UIMachineSettingsSerial.cpp \
     1408        src/settings/machine/UIMachineSettingsStorage.cpp \
     1409        src/settings/machine/UIMachineSettingsSystem.cpp \
     1410        src/settings/machine/UIMachineSettingsUSB.cpp \
     1411        src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
    13821412        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    13831413        src/widgets/UIBootTable.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

    r71027 r72109  
    2727typedef UISettingsCache<UIDataSettingsMachineAudio> UISettingsCacheMachineAudio;
    2828
    29 
    3029/** Machine settings: Audio page. */
    31 class UIMachineSettingsAudio : public UISettingsPageMachine,
    32                                public Ui::UIMachineSettingsAudio
     30class SHARED_LIBRARY_STUFF UIMachineSettingsAudio : public UISettingsPageMachine,
     31                                                    public Ui::UIMachineSettingsAudio
    3332{
    3433    Q_OBJECT;
    … …  
    8180
    8281#endif /* !___UIMachineSettingsAudio_h___ */
    83 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

    r71027 r72109  
    3131typedef UISettingsCache<UIDataSettingsMachineDisplay> UISettingsCacheMachineDisplay;
    3232
    33 
    3433/** Machine settings: Display page. */
    35 class UIMachineSettingsDisplay : public UISettingsPageMachine,
    36                                  public Ui::UIMachineSettingsDisplay
     34class SHARED_LIBRARY_STUFF UIMachineSettingsDisplay : public UISettingsPageMachine,
     35                                                      public Ui::UIMachineSettingsDisplay
    3736{
    3837    Q_OBJECT;
    … …  
    186185
    187186#endif /* !___UIMachineSettingsDisplay_h___ */
    188 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

    r71027 r72109  
    2828typedef UISettingsCache<UIDataSettingsMachineGeneral> UISettingsCacheMachineGeneral;
    2929
    30 
    3130/** Machine settings: General page. */
    32 class UIMachineSettingsGeneral : public UISettingsPageMachine,
    33                                  public Ui::UIMachineSettingsGeneral
     31class SHARED_LIBRARY_STUFF UIMachineSettingsGeneral : public UISettingsPageMachine,
     32                                                      public Ui::UIMachineSettingsGeneral
    3433{
    3534    Q_OBJECT;
    … …  
    141140
    142141#endif /* !___UIMachineSettingsGeneral_h___ */
    143 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

    r71027 r72109  
    2828typedef UISettingsCache<UIDataSettingsMachineInterface> UISettingsCacheMachineInterface;
    2929
    30 
    3130/** Machine settings: User Interface page. */
    32 class UIMachineSettingsInterface : public UISettingsPageMachine,
    33                                    public Ui::UIMachineSettingsInterface
     31class SHARED_LIBRARY_STUFF UIMachineSettingsInterface : public UISettingsPageMachine,
     32                                                        public Ui::UIMachineSettingsInterface
    3433{
    3534    Q_OBJECT;
    … …  
    9392
    9493#endif /* !___UIMachineSettingsInterface_h___ */
    95 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h

    r71027 r72109  
    3232typedef UISettingsCachePool<UIDataSettingsMachineNetwork, UISettingsCacheMachineNetworkAdapter> UISettingsCacheMachineNetwork;
    3333
    34 
    3534/** Machine settings: Network page. */
    36 class UIMachineSettingsNetworkPage : public UISettingsPageMachine
     35class SHARED_LIBRARY_STUFF UIMachineSettingsNetworkPage : public UISettingsPageMachine
    3736{
    3837    Q_OBJECT;
    … …  
    143142
    144143#endif /* !___UIMachineSettingsNetwork_h___ */
    145 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h

    r71027 r72109  
    2828
    2929/* Machine settings / Network page / NAT attachment / Port forwarding dialog: */
    30 class UIMachineSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
     30class SHARED_LIBRARY_STUFF UIMachineSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
    3131{
    3232    Q_OBJECT;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

    r71027 r72109  
    3434typedef UISettingsCachePool<UIDataSettingsSharedFolders, UISettingsCacheSharedFolder> UISettingsCacheSharedFolders;
    3535
    36 
    3736/** Machine settings: Shared Folders page. */
    38 class UIMachineSettingsSF : public UISettingsPageMachine,
    39                             public Ui::UIMachineSettingsSF
     37class SHARED_LIBRARY_STUFF UIMachineSettingsSF : public UISettingsPageMachine,
     38                                                 public Ui::UIMachineSettingsSF
    4039{
    4140    Q_OBJECT;
    … …  
    154153
    155154#endif /* !___UIMachineSettingsSF_h___ */
    156 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h

    r69500 r72109  
    2626
    2727/* Shared folders details dialog: */
    28 class UIMachineSettingsSFDetails : public QIWithRetranslateUI2<QIDialog>,
    29                                    public Ui::UIMachineSettingsSFDetails
     28class SHARED_LIBRARY_STUFF UIMachineSettingsSFDetails : public QIWithRetranslateUI2<QIDialog>,
     29                                                        public Ui::UIMachineSettingsSFDetails
    3030{
    3131    Q_OBJECT;
    … …  
    7676
    7777#endif // __UIMachineSettingsSFDetails_h__
    78 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h

    r71027 r72109  
    3131typedef UISettingsCachePool<UIDataSettingsMachineSerial, UISettingsCacheMachineSerialPort> UISettingsCacheMachineSerial;
    3232
    33 
    3433/** Machine settings: Serial page. */
    35 class UIMachineSettingsSerialPage : public UISettingsPageMachine
     34class SHARED_LIBRARY_STUFF UIMachineSettingsSerialPage : public UISettingsPageMachine
    3635{
    3736    Q_OBJECT;
    … …  
    9291
    9392#endif /* !___UIMachineSettingsSerial_h___ */
    94 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

    r71027 r72109  
    134134
    135135/* Abstract Controller Type */
    136 class AbstractControllerType
     136class SHARED_LIBRARY_STUFF AbstractControllerType
    137137{
    138138public:
    … …  
    161161
    162162/* IDE Controller Type */
    163 class IDEControllerType : public AbstractControllerType
     163class SHARED_LIBRARY_STUFF IDEControllerType : public AbstractControllerType
    164164{
    165165public:
    … …  
    174174
    175175/* SATA Controller Type */
    176 class SATAControllerType : public AbstractControllerType
     176class SHARED_LIBRARY_STUFF SATAControllerType : public AbstractControllerType
    177177{
    178178public:
    … …  
    187187
    188188/* SCSI Controller Type */
    189 class SCSIControllerType : public AbstractControllerType
     189class SHARED_LIBRARY_STUFF SCSIControllerType : public AbstractControllerType
    190190{
    191191public:
    … …  
    200200
    201201/* Floppy Controller Type */
    202 class FloppyControllerType : public AbstractControllerType
     202class SHARED_LIBRARY_STUFF FloppyControllerType : public AbstractControllerType
    203203{
    204204public:
    … …  
    213213
    214214/* SAS Controller Type */
    215 class SASControllerType : public AbstractControllerType
     215class SHARED_LIBRARY_STUFF SASControllerType : public AbstractControllerType
    216216{
    217217public:
    … …  
    226226
    227227/* USB Controller Type */
    228 class USBStorageControllerType : public AbstractControllerType
     228class SHARED_LIBRARY_STUFF USBStorageControllerType : public AbstractControllerType
    229229{
    230230public:
    … …  
    239239
    240240/* NVMe Controller Type */
    241 class NVMeStorageControllerType : public AbstractControllerType
     241class SHARED_LIBRARY_STUFF NVMeStorageControllerType : public AbstractControllerType
    242242{
    243243public:
    … …  
    252252
    253253/* Abstract Item */
    254 class AbstractItem : public QITreeViewItem
     254class SHARED_LIBRARY_STUFF AbstractItem : public QITreeViewItem
    255255{
    256256    Q_OBJECT;
    … …  
    295295
    296296/* Root Item */
    297 class RootItem : public AbstractItem
     297class SHARED_LIBRARY_STUFF RootItem : public AbstractItem
    298298{
    299299public:
    … …  
    321321
    322322/* Controller Item */
    323 class ControllerItem : public AbstractItem
     323class SHARED_LIBRARY_STUFF ControllerItem : public AbstractItem
    324324{
    325325public:
    … …  
    371371
    372372/* Attachment Item */
    373 class AttachmentItem : public AbstractItem
     373class SHARED_LIBRARY_STUFF AttachmentItem : public AbstractItem
    374374{
    375375public:
    … …  
    443443
    444444/* Storage Model */
    445 class StorageModel : public QAbstractItemModel
     445class SHARED_LIBRARY_STUFF StorageModel : public QAbstractItemModel
    446446{
    447447    Q_OBJECT;
    … …  
    583583
    584584/* Storage Delegate */
    585 class StorageDelegate : public QItemDelegate
     585class SHARED_LIBRARY_STUFF StorageDelegate : public QItemDelegate
    586586{
    587587    Q_OBJECT;
    … …  
    598598
    599599/** Machine settings: Storage page. */
    600 class UIMachineSettingsStorage : public UISettingsPageMachine,
    601                                  public Ui::UIMachineSettingsStorage
     600class SHARED_LIBRARY_STUFF UIMachineSettingsStorage : public UISettingsPageMachine,
     601                                                      public Ui::UIMachineSettingsStorage
    602602{
    603603    Q_OBJECT;
    … …  
    844844};
    845845
     846
    846847#endif /* !___UIMachineSettingsStorage_h___ */
    847 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

    r71027 r72109  
    2727typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
    2828
    29 
    3029/** Machine settings: System page. */
    31 class UIMachineSettingsSystem : public UISettingsPageMachine,
    32                                 public Ui::UIMachineSettingsSystem
     30class SHARED_LIBRARY_STUFF UIMachineSettingsSystem : public UISettingsPageMachine,
     31                                                     public Ui::UIMachineSettingsSystem
    3332{
    3433    Q_OBJECT;
    … …  
    165164
    166165#endif /* !___UIMachineSettingsSystem_h___ */
    167 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

    r71027 r72109  
    3131typedef UISettingsCachePool<UIDataSettingsMachineUSB, UISettingsCacheMachineUSBFilter> UISettingsCacheMachineUSB;
    3232
    33 
    3433/** Machine settings: USB page. */
    35 class UIMachineSettingsUSB : public UISettingsPageMachine,
    36                              public Ui::UIMachineSettingsUSB
     34class SHARED_LIBRARY_STUFF UIMachineSettingsUSB : public UISettingsPageMachine,
     35                                                  public Ui::UIMachineSettingsUSB
    3736{
    3837    Q_OBJECT;
    … …  
    161160
    162161#endif /* !___UIMachineSettingsUSB_h___ */
    163 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.h

    r69500 r72109  
    2424#include "UIMachineSettingsUSB.h"
    2525
    26 class UIMachineSettingsUSBFilterDetails : public QIWithRetranslateUI2<QIDialog>,
    27                                           public Ui::UIMachineSettingsUSBFilterDetails
     26class SHARED_LIBRARY_STUFF UIMachineSettingsUSBFilterDetails : public QIWithRetranslateUI2<QIDialog>,
     27                                                               public Ui::UIMachineSettingsUSBFilterDetails
    2828{
    2929    Q_OBJECT;
    … …  
    3939
    4040#endif /* __UIMachineSettingsUSBFilterDetails_h__ */
    41 
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