VirtualBox

Changeset 66176 in vbox


Ignore:
Timestamp:
Mar 21, 2017 11:25:20 AM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
114088
Message:

FE/Qt: Machine settings: Some doxy & coding-style.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsAudio_h__
    19 #define __UIMachineSettingsAudio_h__
     18#ifndef ___UIMachineSettingsAudio_h___
     19#define ___UIMachineSettingsAudio_h___
    2020
    2121/* GUI includes: */
    … …  
    2323#include "UIMachineSettingsAudio.gen.h"
    2424
    25 /* Machine settings / Audio page / Data: */
     25
     26/** Machine settings: Audio page data structure. */
    2627struct UIDataSettingsMachineAudio
    2728{
    28     /* Constructor: */
     29    /** Constructs data. */
    2930    UIDataSettingsMachineAudio()
    3031        : m_fAudioEnabled(false)
    3132        , m_audioDriverType(KAudioDriverType_Null)
    32         , m_audioControllerType(KAudioControllerType_AC97) {}
     33        , m_audioControllerType(KAudioControllerType_AC97)
     34    {}
    3335
    34     /* Helpers: Compare functions/operators: */
     36    /** Returns whether the @a other passed data is equal to this one. */
    3537    bool equal(const UIDataSettingsMachineAudio &other) const
    3638    {
    37         return (m_fAudioEnabled == other.m_fAudioEnabled) &&
    38                (m_audioDriverType == other.m_audioDriverType) &&
    39                (m_audioControllerType == other.m_audioControllerType);
     39        return true
     40               && (m_fAudioEnabled == other.m_fAudioEnabled)
     41               && (m_audioDriverType == other.m_audioDriverType)
     42               && (m_audioControllerType == other.m_audioControllerType)
     43               ;
    4044    }
     45
     46    /** Returns whether the @a other passed data is equal to this one. */
    4147    bool operator==(const UIDataSettingsMachineAudio &other) const { return equal(other); }
     48    /** Returns whether the @a other passed data is different from this one. */
    4249    bool operator!=(const UIDataSettingsMachineAudio &other) const { return !equal(other); }
    4350
    44     /* Variables: */
    45     bool m_fAudioEnabled;
    46     KAudioDriverType m_audioDriverType;
    47     KAudioControllerType m_audioControllerType;
     51    /** Holds whether the audio is enabled. */
     52    bool                  m_fAudioEnabled;
     53    /** Holds the audio driver type. */
     54    KAudioDriverType      m_audioDriverType;
     55    /** Holds the audio controller type. */
     56    KAudioControllerType  m_audioControllerType;
    4857};
    4958typedef UISettingsCache<UIDataSettingsMachineAudio> UISettingsCacheMachineAudio;
    5059
    51 /* Machine settings / Audio page: */
    52 class UIMachineSettingsAudio : public UISettingsPageMachine, public Ui::UIMachineSettingsAudio
     60
     61/** Machine settings: Audio page. */
     62class UIMachineSettingsAudio : public UISettingsPageMachine,
     63                               public Ui::UIMachineSettingsAudio
    5364{
    5465    Q_OBJECT;
    … …  
    97108};
    98109
    99 #endif // __UIMachineSettingsAudio_h__
     110#endif /* !___UIMachineSettingsAudio_h___ */
    100111

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2008-2016 Oracle Corporation
     7 * Copyright (C) 2008-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsDisplay_h__
    19 #define __UIMachineSettingsDisplay_h__
     18#ifndef ___UIMachineSettingsDisplay_h___
     19#define ___UIMachineSettingsDisplay_h___
    2020
    2121/* GUI includes: */
    … …  
    2929class UIActionPool;
    3030
    31 /* Machine settings / Display page / Data: */
     31
     32/** Machine settings: Display page data structure. */
    3233struct UIDataSettingsMachineDisplay
    3334{
    34     /* Constructor: */
     35    /** Constructs data. */
    3536    UIDataSettingsMachineDisplay()
    3637        : m_iCurrentVRAM(0)
    … …  
    5960    {}
    6061
    61     /* Functions: */
     62    /** Returns whether the @a other passed data is equal to this one. */
    6263    bool equal(const UIDataSettingsMachineDisplay &other) const
    6364    {
    64         return (m_iCurrentVRAM == other.m_iCurrentVRAM) &&
    65                (m_cGuestScreenCount == other.m_cGuestScreenCount) &&
    66                (m_dScaleFactor == other.m_dScaleFactor) &&
     65        return true
     66               && (m_iCurrentVRAM == other.m_iCurrentVRAM)
     67               && (m_cGuestScreenCount == other.m_cGuestScreenCount)
     68               && (m_dScaleFactor == other.m_dScaleFactor)
    6769#ifdef VBOX_WS_MAC
    68                (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) &&
     70               && (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput)
    6971#endif /* VBOX_WS_MAC */
    70                (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled) &&
    71 #ifdef VBOX_WITH_VIDEOHWACCEL
    72                (m_f2dAccelerationEnabled == other.m_f2dAccelerationEnabled) &&
    73 #endif /* VBOX_WITH_VIDEOHWACCEL */
    74                (m_fRemoteDisplayServerSupported == other.m_fRemoteDisplayServerSupported) &&
    75                (m_fRemoteDisplayServerEnabled == other.m_fRemoteDisplayServerEnabled) &&
    76                (m_strRemoteDisplayPort == other.m_strRemoteDisplayPort) &&
    77                (m_remoteDisplayAuthType == other.m_remoteDisplayAuthType) &&
    78                (m_uRemoteDisplayTimeout == other.m_uRemoteDisplayTimeout) &&
    79                (m_fRemoteDisplayMultiConnAllowed == other.m_fRemoteDisplayMultiConnAllowed) &&
    80                (m_fVideoCaptureEnabled == other.m_fVideoCaptureEnabled) &&
    81                (m_strVideoCaptureFilePath == other.m_strVideoCaptureFilePath) &&
    82                (m_iVideoCaptureFrameWidth == other.m_iVideoCaptureFrameWidth) &&
    83                (m_iVideoCaptureFrameHeight == other.m_iVideoCaptureFrameHeight) &&
    84                (m_iVideoCaptureFrameRate == other.m_iVideoCaptureFrameRate) &&
    85                (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate) &&
    86                (m_screens == other.m_screens);
     72               && (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled)
     73#ifdef VBOX_WITH_VIDEOHWACCEL
     74               && (m_f2dAccelerationEnabled == other.m_f2dAccelerationEnabled)
     75#endif /* VBOX_WITH_VIDEOHWACCEL */
     76               && (m_fRemoteDisplayServerSupported == other.m_fRemoteDisplayServerSupported)
     77               && (m_fRemoteDisplayServerEnabled == other.m_fRemoteDisplayServerEnabled)
     78               && (m_strRemoteDisplayPort == other.m_strRemoteDisplayPort)
     79               && (m_remoteDisplayAuthType == other.m_remoteDisplayAuthType)
     80               && (m_uRemoteDisplayTimeout == other.m_uRemoteDisplayTimeout)
     81               && (m_fRemoteDisplayMultiConnAllowed == other.m_fRemoteDisplayMultiConnAllowed)
     82               && (m_fVideoCaptureEnabled == other.m_fVideoCaptureEnabled)
     83               && (m_strVideoCaptureFilePath == other.m_strVideoCaptureFilePath)
     84               && (m_iVideoCaptureFrameWidth == other.m_iVideoCaptureFrameWidth)
     85               && (m_iVideoCaptureFrameHeight == other.m_iVideoCaptureFrameHeight)
     86               && (m_iVideoCaptureFrameRate == other.m_iVideoCaptureFrameRate)
     87               && (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate)
     88               && (m_screens == other.m_screens)
     89               ;
    8790    }
    8891
    89     /* Operators: */
     92    /** Returns whether the @a other passed data is equal to this one. */
    9093    bool operator==(const UIDataSettingsMachineDisplay &other) const { return equal(other); }
     94    /** Returns whether the @a other passed data is different from this one. */
    9195    bool operator!=(const UIDataSettingsMachineDisplay &other) const { return !equal(other); }
    9296
    93     /* Variables: Video stuff: */
    94     int m_iCurrentVRAM;
    95     int m_cGuestScreenCount;
    96     double m_dScaleFactor;
     97    /** Holds the video RAM amount. */
     98    int     m_iCurrentVRAM;
     99    /** Holds the guest screen count. */
     100    int     m_cGuestScreenCount;
     101    /** Holds the guest screen scale-factor. */
     102    double  m_dScaleFactor;
    97103#ifdef VBOX_WS_MAC
    98     bool m_fUseUnscaledHiDPIOutput;
     104    /** Holds whether automatic Retina scaling is disabled. */
     105    bool    m_fUseUnscaledHiDPIOutput;
    99106#endif /* VBOX_WS_MAC */
    100     bool m_f3dAccelerationEnabled;
    101 #ifdef VBOX_WITH_VIDEOHWACCEL
    102     bool m_f2dAccelerationEnabled;
    103 #endif /* VBOX_WITH_VIDEOHWACCEL */
    104 
    105     /* Variables: Remote Display stuff: */
    106     bool m_fRemoteDisplayServerSupported;
    107     bool m_fRemoteDisplayServerEnabled;
    108     QString m_strRemoteDisplayPort;
    109     KAuthType m_remoteDisplayAuthType;
    110     ulong m_uRemoteDisplayTimeout;
    111     bool m_fRemoteDisplayMultiConnAllowed;
    112 
    113     /* Variables: Video Capture stuff: */
     107    /** Holds whether the 3D acceleration is enabled. */
     108    bool    m_f3dAccelerationEnabled;
     109#ifdef VBOX_WITH_VIDEOHWACCEL
     110    /** Holds whether the 2D video acceleration is enabled. */
     111    bool    m_f2dAccelerationEnabled;
     112#endif /* VBOX_WITH_VIDEOHWACCEL */
     113
     114    /** Holds whether the remote display server is supported. */
     115    bool       m_fRemoteDisplayServerSupported;
     116    /** Holds whether the remote display server is enabled. */
     117    bool       m_fRemoteDisplayServerEnabled;
     118    /** Holds the remote display server port. */
     119    QString    m_strRemoteDisplayPort;
     120    /** Holds the remote display server auth type. */
     121    KAuthType  m_remoteDisplayAuthType;
     122    /** Holds the remote display server timeout. */
     123    ulong      m_uRemoteDisplayTimeout;
     124    /** Holds whether the remote display server allows multiple connections. */
     125    bool       m_fRemoteDisplayMultiConnAllowed;
     126
     127    /** Holds whether the video capture is enabled. */
    114128    bool m_fVideoCaptureEnabled;
     129    /** Holds the video capture folder. */
    115130    QString m_strVideoCaptureFolder;
     131    /** Holds the video capture file path. */
    116132    QString m_strVideoCaptureFilePath;
     133    /** Holds the video capture frame width. */
    117134    int m_iVideoCaptureFrameWidth;
     135    /** Holds the video capture frame height. */
    118136    int m_iVideoCaptureFrameHeight;
     137    /** Holds the video capture frame rate. */
    119138    int m_iVideoCaptureFrameRate;
     139    /** Holds the video capture bit rate. */
    120140    int m_iVideoCaptureBitRate;
     141    /** Holds which of the guest screens should be captured. */
    121142    QVector<BOOL> m_screens;
    122143};
    123144typedef UISettingsCache<UIDataSettingsMachineDisplay> UISettingsCacheMachineDisplay;
    124145
    125 /* Machine settings / Display page: */
     146
     147/** Machine settings: Display page. */
    126148class UIMachineSettingsDisplay : public UISettingsPageMachine,
    127149                                 public Ui::UIMachineSettingsDisplay
    … …  
    241263};
    242264
    243 #endif // __UIMachineSettingsDisplay_h__
    244 
     265#endif /* !___UIMachineSettingsDisplay_h___ */
     266

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

    r65629 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424#include "UIAddDiskEncryptionPasswordDialog.h"
    2525
    26 /** Machine settings: General page: Data structure. */
     26
     27/** Machine settings: General page data structure. */
    2728struct UIDataSettingsMachineGeneral
    2829{
    29     /** Constructor. */
     30    /** Constructs data. */
    3031    UIDataSettingsMachineGeneral()
    3132        : m_strName(QString())
    … …  
    4344    {}
    4445
    45     /** Returns whether passed @a other is equal to this. */
     46    /** Returns whether the @a other passed data is equal to this one. */
    4647    bool equal(const UIDataSettingsMachineGeneral &other) const
    4748    {
    48         return (m_strName == other.m_strName) &&
    49                (m_strGuestOsTypeId == other.m_strGuestOsTypeId) &&
    50                (m_strSnapshotsFolder == other.m_strSnapshotsFolder) &&
    51                (m_strSnapshotsHomeDir == other.m_strSnapshotsHomeDir) &&
    52                (m_clipboardMode == other.m_clipboardMode) &&
    53                (m_dndMode == other.m_dndMode) &&
    54                (m_strDescription == other.m_strDescription) &&
    55                (m_fEncryptionEnabled == other.m_fEncryptionEnabled) &&
    56                (m_fEncryptionCipherChanged == other.m_fEncryptionCipherChanged) &&
    57                (m_fEncryptionPasswordChanged == other.m_fEncryptionPasswordChanged);
     49        return true
     50               && (m_strName == other.m_strName)
     51               && (m_strGuestOsTypeId == other.m_strGuestOsTypeId)
     52               && (m_strSnapshotsFolder == other.m_strSnapshotsFolder)
     53               && (m_strSnapshotsHomeDir == other.m_strSnapshotsHomeDir)
     54               && (m_clipboardMode == other.m_clipboardMode)
     55               && (m_dndMode == other.m_dndMode)
     56               && (m_strDescription == other.m_strDescription)
     57               && (m_fEncryptionEnabled == other.m_fEncryptionEnabled)
     58               && (m_fEncryptionCipherChanged == other.m_fEncryptionCipherChanged)
     59               && (m_fEncryptionPasswordChanged == other.m_fEncryptionPasswordChanged)
     60               ;
    5861    }
    5962
    60     /** Operator== implementation which returns whether passed @a other is equal to this. */
     63    /** Returns whether the @a other passed data is equal to this one. */
    6164    bool operator==(const UIDataSettingsMachineGeneral &other) const { return equal(other); }
    62     /** Operator!= implementation which returns whether passed @a other is differs from this. */
     65    /** Returns whether the @a other passed data is different from this one. */
    6366    bool operator!=(const UIDataSettingsMachineGeneral &other) const { return !equal(other); }
    6467
    6568    /** Holds the VM name. */
    66     QString m_strName;
     69    QString  m_strName;
    6770    /** Holds the VM OS type ID. */
    68     QString m_strGuestOsTypeId;
     71    QString  m_strGuestOsTypeId;
    6972
    7073    /** Holds the VM snapshot folder. */
    71     QString m_strSnapshotsFolder;
     74    QString         m_strSnapshotsFolder;
    7275    /** Holds the default VM snapshot folder. */
    73     QString m_strSnapshotsHomeDir;
     76    QString         m_strSnapshotsHomeDir;
    7477    /** Holds the VM shared clipboard mode. */
    75     KClipboardMode m_clipboardMode;
     78    KClipboardMode  m_clipboardMode;
    7679    /** Holds the VM drag&drop mode. */
    77     KDnDMode m_dndMode;
     80    KDnDMode        m_dndMode;
    7881
    7982    /** Holds the VM description. */
    80     QString m_strDescription;
     83    QString  m_strDescription;
    8184
    8285    /** Holds whether the encryption is enabled. */
    83     bool m_fEncryptionEnabled;
     86    bool                   m_fEncryptionEnabled;
    8487    /** Holds whether the encryption cipher was changed. */
    85     bool m_fEncryptionCipherChanged;
     88    bool                   m_fEncryptionCipherChanged;
    8689    /** Holds whether the encryption password was changed. */
    87     bool m_fEncryptionPasswordChanged;
     90    bool                   m_fEncryptionPasswordChanged;
    8891    /** Holds the encryption cipher index. */
    89     int m_iEncryptionCipherIndex;
     92    int                    m_iEncryptionCipherIndex;
    9093    /** Holds the encryption password. */
    91     QString m_strEncryptionPassword;
     94    QString                m_strEncryptionPassword;
    9295    /** Holds the encrypted medium ids. */
    93     EncryptedMediumMap m_encryptedMediums;
     96    EncryptedMediumMap     m_encryptedMediums;
    9497    /** Holds the encryption passwords. */
    95     EncryptionPasswordMap m_encryptionPasswords;
     98    EncryptionPasswordMap  m_encryptionPasswords;
    9699};
    97100typedef UISettingsCache<UIDataSettingsMachineGeneral> UISettingsCacheMachineGeneral;
     101
    98102
    99103/** Machine settings: General page. */
    … …  
    192196
    193197#endif /* !___UIMachineSettingsGeneral_h___ */
     198

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2008-2016 Oracle Corporation
     7 * Copyright (C) 2008-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2626class UIActionPool;
    2727
    28 /* Machine settings / User Interface page / Data: */
     28
     29/** Machine settings: User Interface page data structure. */
    2930struct UIDataSettingsMachineInterface
    3031{
    31     /* Constructor: */
     32    /** Constructs data. */
    3233    UIDataSettingsMachineInterface()
    3334        : m_fStatusBarEnabled(false)
    … …  
    5455    {}
    5556
    56     /* Functions: */
     57    /** Returns whether the @a other passed data is equal to this one. */
    5758    bool equal(const UIDataSettingsMachineInterface &other) const
    5859    {
    59         return    (m_fStatusBarEnabled == other.m_fStatusBarEnabled)
     60        return true
     61               && (m_fStatusBarEnabled == other.m_fStatusBarEnabled)
    6062               && (m_statusBarRestrictions == other.m_statusBarRestrictions)
    6163               && (m_statusBarOrder == other.m_statusBarOrder)
    … …  
    8385    }
    8486
    85     /* Operators: */
     87    /** Returns whether the @a other passed data is equal to this one. */
    8688    bool operator==(const UIDataSettingsMachineInterface &other) const { return equal(other); }
     89    /** Returns whether the @a other passed data is different from this one. */
    8790    bool operator!=(const UIDataSettingsMachineInterface &other) const { return !equal(other); }
    8891
    89     /* Variables: */
    90     bool m_fStatusBarEnabled;
    91     QList<IndicatorType> m_statusBarRestrictions;
    92     QList<IndicatorType> m_statusBarOrder;
     92    /** Holds whether the status-bar is enabled. */
     93    bool                  m_fStatusBarEnabled;
     94    /** Holds the status-bar indicator restrictions. */
     95    QList<IndicatorType>  m_statusBarRestrictions;
     96    /** Holds the status-bar indicator order. */
     97    QList<IndicatorType>  m_statusBarOrder;
     98
    9399#ifndef VBOX_WS_MAC
    94     bool m_fMenuBarEnabled;
     100    /** Holds whether the menu-bar is enabled. */
     101    bool                                                m_fMenuBarEnabled;
    95102#endif /* !VBOX_WS_MAC */
    96     UIExtraDataMetaDefs::MenuType m_restrictionsOfMenuBar;
    97     UIExtraDataMetaDefs::MenuApplicationActionType m_restrictionsOfMenuApplication;
    98     UIExtraDataMetaDefs::RuntimeMenuMachineActionType m_restrictionsOfMenuMachine;
    99     UIExtraDataMetaDefs::RuntimeMenuViewActionType m_restrictionsOfMenuView;
    100     UIExtraDataMetaDefs::RuntimeMenuInputActionType m_restrictionsOfMenuInput;
    101     UIExtraDataMetaDefs::RuntimeMenuDevicesActionType m_restrictionsOfMenuDevices;
     103    /** Holds the menu-bar menu restrictions. */
     104    UIExtraDataMetaDefs::MenuType                       m_restrictionsOfMenuBar;
     105    /** Holds the Application menu restrictions. */
     106    UIExtraDataMetaDefs::MenuApplicationActionType      m_restrictionsOfMenuApplication;
     107    /** Holds the Machine menu restrictions. */
     108    UIExtraDataMetaDefs::RuntimeMenuMachineActionType   m_restrictionsOfMenuMachine;
     109    /** Holds the View menu restrictions. */
     110    UIExtraDataMetaDefs::RuntimeMenuViewActionType      m_restrictionsOfMenuView;
     111    /** Holds the Input menu restrictions. */
     112    UIExtraDataMetaDefs::RuntimeMenuInputActionType     m_restrictionsOfMenuInput;
     113    /** Holds the Devices menu restrictions. */
     114    UIExtraDataMetaDefs::RuntimeMenuDevicesActionType   m_restrictionsOfMenuDevices;
    102115#ifdef VBOX_WITH_DEBUGGER_GUI
    103     UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType m_restrictionsOfMenuDebug;
     116    /** Holds the Debug menu restrictions. */
     117    UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType  m_restrictionsOfMenuDebug;
    104118#endif /* VBOX_WITH_DEBUGGER_GUI */
    105119#ifdef VBOX_WS_MAC
    106     UIExtraDataMetaDefs::MenuWindowActionType m_restrictionsOfMenuWindow;
     120    /** Holds the Window menu restrictions. */
     121    UIExtraDataMetaDefs::MenuWindowActionType           m_restrictionsOfMenuWindow;
    107122#endif /* VBOX_WS_MAC */
    108     UIExtraDataMetaDefs::MenuHelpActionType m_restrictionsOfMenuHelp;
     123    /** Holds the Help menu restrictions. */
     124    UIExtraDataMetaDefs::MenuHelpActionType             m_restrictionsOfMenuHelp;
     125
    109126#ifndef VBOX_WS_MAC
    110     bool m_fShowMiniToolBar;
    111     bool m_fMiniToolBarAtTop;
     127    /** Holds whether the mini-toolbar is enabled. */
     128    bool  m_fShowMiniToolBar;
     129    /** Holds whether the mini-toolbar should be aligned at top of screen. */
     130    bool  m_fMiniToolBarAtTop;
    112131#endif /* !VBOX_WS_MAC */
    113132};
    114133typedef UISettingsCache<UIDataSettingsMachineInterface> UISettingsCacheMachineInterface;
    115134
    116 /* Machine settings / User Interface page: */
     135
     136/** Machine settings: User Interface page. */
    117137class UIMachineSettingsInterface : public UISettingsPageMachine,
    118138                                   public Ui::UIMachineSettingsInterface
    … …  
    172192};
    173193
    174 #endif // ___UIMachineSettingsInterface_h___
     194#endif /* !___UIMachineSettingsInterface_h___ */
     195

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2008-2016 Oracle Corporation
     7 * Copyright (C) 2008-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsNetwork_h__
    19 #define __UIMachineSettingsNetwork_h__
    20 
    21 /* Local includes: */
     18#ifndef ___UIMachineSettingsNetwork_h___
     19#define ___UIMachineSettingsNetwork_h___
     20
     21/* GUI includes: */
    2222#include "UISettingsPage.h"
    2323#include "UIMachineSettingsNetwork.gen.h"
    … …  
    2828class QITabWidget;
    2929
    30 /* Machine settings / Network page / Adapter data: */
     30
     31/** Machine settings: Network Adapter data structure. */
    3132struct UIDataSettingsMachineNetworkAdapter
    3233{
    33     /* Default constructor: */
     34    /** Constructs data. */
    3435    UIDataSettingsMachineNetworkAdapter()
    3536        : m_iSlot(0)
    … …  
    4647        , m_strMACAddress(QString())
    4748        , m_fCableConnected(false)
    48         , m_redirects(UIPortForwardingDataList()) {}
    49     /* Functions: */
     49        , m_redirects(UIPortForwardingDataList())
     50    {}
     51
     52    /** Returns whether the @a other passed data is equal to this one. */
    5053    bool equal(const UIDataSettingsMachineNetworkAdapter &other) const
    5154    {
    52         return (m_iSlot == other.m_iSlot) &&
    53                (m_fAdapterEnabled == other.m_fAdapterEnabled) &&
    54                (m_adapterType == other.m_adapterType) &&
    55                (m_attachmentType == other.m_attachmentType) &&
    56                (m_promiscuousMode == other.m_promiscuousMode) &&
    57                (m_strBridgedAdapterName == other.m_strBridgedAdapterName) &&
    58                (m_strInternalNetworkName == other.m_strInternalNetworkName) &&
    59                (m_strHostInterfaceName == other.m_strHostInterfaceName) &&
    60                (m_strGenericDriverName == other.m_strGenericDriverName) &&
    61                (m_strGenericProperties == other.m_strGenericProperties) &&
    62                (m_strNATNetworkName == other.m_strNATNetworkName) &&
    63                (m_strMACAddress == other.m_strMACAddress) &&
    64                (m_fCableConnected == other.m_fCableConnected) &&
    65                (m_redirects == other.m_redirects);
     55        return true
     56               && (m_iSlot == other.m_iSlot)
     57               && (m_fAdapterEnabled == other.m_fAdapterEnabled)
     58               && (m_adapterType == other.m_adapterType)
     59               && (m_attachmentType == other.m_attachmentType)
     60               && (m_promiscuousMode == other.m_promiscuousMode)
     61               && (m_strBridgedAdapterName == other.m_strBridgedAdapterName)
     62               && (m_strInternalNetworkName == other.m_strInternalNetworkName)
     63               && (m_strHostInterfaceName == other.m_strHostInterfaceName)
     64               && (m_strGenericDriverName == other.m_strGenericDriverName)
     65               && (m_strGenericProperties == other.m_strGenericProperties)
     66               && (m_strNATNetworkName == other.m_strNATNetworkName)
     67               && (m_strMACAddress == other.m_strMACAddress)
     68               && (m_fCableConnected == other.m_fCableConnected)
     69               && (m_redirects == other.m_redirects)
     70               ;
    6671    }
    67     /* Operators: */
     72
     73    /** Returns whether the @a other passed data is equal to this one. */
    6874    bool operator==(const UIDataSettingsMachineNetworkAdapter &other) const { return equal(other); }
     75    /** Returns whether the @a other passed data is different from this one. */
    6976    bool operator!=(const UIDataSettingsMachineNetworkAdapter &other) const { return !equal(other); }
    70     /* Variables: */
    71     int m_iSlot;
    72     bool m_fAdapterEnabled;
    73     KNetworkAdapterType m_adapterType;
    74     KNetworkAttachmentType m_attachmentType;
    75     KNetworkAdapterPromiscModePolicy m_promiscuousMode;
    76     QString m_strBridgedAdapterName;
    77     QString m_strInternalNetworkName;
    78     QString m_strHostInterfaceName;
    79     QString m_strGenericDriverName;
    80     QString m_strGenericProperties;
    81     QString m_strNATNetworkName;
    82     QString m_strMACAddress;
    83     bool m_fCableConnected;
    84     UIPortForwardingDataList m_redirects;
     77
     78    /** Holds the network adapter slot number. */
     79    int                               m_iSlot;
     80    /** Holds whether the network adapter is enabled. */
     81    bool                              m_fAdapterEnabled;
     82    /** Holds the network adapter type. */
     83    KNetworkAdapterType               m_adapterType;
     84    /** Holds the network attachment type. */
     85    KNetworkAttachmentType            m_attachmentType;
     86    /** Holds the network promiscuous mode policy. */
     87    KNetworkAdapterPromiscModePolicy  m_promiscuousMode;
     88    /** Holds the bridged adapter name. */
     89    QString                           m_strBridgedAdapterName;
     90    /** Holds the internal network name. */
     91    QString                           m_strInternalNetworkName;
     92    /** Holds the host interface name. */
     93    QString                           m_strHostInterfaceName;
     94    /** Holds the generic driver name. */
     95    QString                           m_strGenericDriverName;
     96    /** Holds the generic driver properties. */
     97    QString                           m_strGenericProperties;
     98    /** Holds the NAT network name. */
     99    QString                           m_strNATNetworkName;
     100    /** Holds the network adapter MAC address. */
     101    QString                           m_strMACAddress;
     102    /** Holds whether the network adapter is connected. */
     103    bool                              m_fCableConnected;
     104    /** Holds the set of network redirection rules. */
     105    UIPortForwardingDataList          m_redirects;
    85106};
    86107typedef UISettingsCache<UIDataSettingsMachineNetworkAdapter> UISettingsCacheMachineNetworkAdapter;
    87108
    88 /* Machine settings / Network page / Network data: */
     109
     110/** Machine settings: Network page data structure. */
    89111struct UIDataSettingsMachineNetwork
    90112{
    91     /* Default constructor: */
     113    /** Constructs data. */
    92114    UIDataSettingsMachineNetwork() {}
    93     /* Operators: */
    94     bool operator==(const UIDataSettingsMachineNetwork& /* other */) const { return true; }
    95     bool operator!=(const UIDataSettingsMachineNetwork& /* other */) const { return false; }
     115
     116    /** Returns whether the @a other passed data is equal to this one. */
     117    bool operator==(const UIDataSettingsMachineNetwork & /* other */) const { return true; }
     118    /** Returns whether the @a other passed data is different from this one. */
     119    bool operator!=(const UIDataSettingsMachineNetwork & /* other */) const { return false; }
    96120};
    97121typedef UISettingsCachePool<UIDataSettingsMachineNetwork, UISettingsCacheMachineNetworkAdapter> UISettingsCacheMachineNetwork;
    98122
    99 /* Machine settings / Network page / Adapter tab: */
    100 class UIMachineSettingsNetwork : public QIWithRetranslateUI<QWidget>, public Ui::UIMachineSettingsNetwork
     123
     124/** Machine settings: Network Adapter tab. */
     125class UIMachineSettingsNetwork : public QIWithRetranslateUI<QWidget>,
     126                                 public Ui::UIMachineSettingsNetwork
    101127{
    102128    Q_OBJECT;
    … …  
    180206};
    181207
    182 /* Machine settings / Network page: */
     208
     209/** Machine settings: Network page. */
    183210class UIMachineSettingsNetworkPage : public UISettingsPageMachine
    184211{
    … …  
    264291};
    265292
    266 #endif // __UIMachineSettingsNetwork_h__
    267 
     293#endif /* !___UIMachineSettingsNetwork_h___ */
     294

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsParallel_h__
    19 #define __UIMachineSettingsParallel_h__
     18#ifndef ___UIMachineSettingsParallel_h___
     19#define ___UIMachineSettingsParallel_h___
    2020
    2121/* GUI includes: */
    … …  
    2727class QITabWidget;
    2828
    29 /* Machine settings / Parallel page / Port data: */
     29
     30/** Machine settings: Parallel Port tab data structure. */
    3031struct UIDataSettingsMachineParallelPort
    3132{
    32     /* Default constructor: */
     33    /** Constructs data. */
    3334    UIDataSettingsMachineParallelPort()
    3435        : m_iSlot(-1)
    … …  
    3637        , m_uIRQ(0)
    3738        , m_uIOBase(0)
    38         , m_strPath(QString()) {}
    39     /* Functions: */
     39        , m_strPath(QString())
     40    {}
     41
     42    /** Returns whether the @a other passed data is equal to this one. */
    4043    bool equal(const UIDataSettingsMachineParallelPort &other) const
    4144    {
    42         return (m_iSlot == other.m_iSlot) &&
    43                (m_fPortEnabled == other.m_fPortEnabled) &&
    44                (m_uIRQ == other.m_uIRQ) &&
    45                (m_uIOBase == other.m_uIOBase) &&
    46                (m_strPath == other.m_strPath);
     45        return true
     46               && (m_iSlot == other.m_iSlot)
     47               && (m_fPortEnabled == other.m_fPortEnabled)
     48               && (m_uIRQ == other.m_uIRQ)
     49               && (m_uIOBase == other.m_uIOBase)
     50               && (m_strPath == other.m_strPath)
     51               ;
    4752    }
    48     /* Operators: */
     53
     54    /** Returns whether the @a other passed data is equal to this one. */
    4955    bool operator==(const UIDataSettingsMachineParallelPort &other) const { return equal(other); }
     56    /** Returns whether the @a other passed data is different from this one. */
    5057    bool operator!=(const UIDataSettingsMachineParallelPort &other) const { return !equal(other); }
    51     /* Variables: */
    52     int m_iSlot;
    53     bool m_fPortEnabled;
    54     ulong m_uIRQ;
    55     ulong m_uIOBase;
    56     QString m_strPath;
     58
     59    /** Holds the parallel port slot number. */
     60    int      m_iSlot;
     61    /** Holds whether the parallel port is enabled. */
     62    bool     m_fPortEnabled;
     63    /** Holds the parallel port IRQ. */
     64    ulong    m_uIRQ;
     65    /** Holds the parallel port IO base. */
     66    ulong    m_uIOBase;
     67    /** Holds the parallel port path. */
     68    QString  m_strPath;
    5769};
    5870typedef UISettingsCache<UIDataSettingsMachineParallelPort> UISettingsCacheMachineParallelPort;
    5971
    60 /* Machine settings / Parallel page / Ports data: */
     72
     73/** Machine settings: Parallel page data structure. */
    6174struct UIDataSettingsMachineParallel
    6275{
    63     /* Default constructor: */
     76    /** Constructs data. */
    6477    UIDataSettingsMachineParallel() {}
    65     /* Operators: */
    66     bool operator==(const UIDataSettingsMachineParallel& /* other */) const { return true; }
    67     bool operator!=(const UIDataSettingsMachineParallel& /* other */) const { return false; }
     78
     79    /** Returns whether the @a other passed data is equal to this one. */
     80    bool operator==(const UIDataSettingsMachineParallel & /* other */) const { return true; }
     81    /** Returns whether the @a other passed data is different from this one. */
     82    bool operator!=(const UIDataSettingsMachineParallel & /* other */) const { return false; }
    6883};
    6984typedef UISettingsCachePool<UIDataSettingsMachineParallel, UISettingsCacheMachineParallelPort> UISettingsCacheMachineParallel;
    7085
     86
     87/** Machine settings: Parallel Port tab. */
    7188class UIMachineSettingsParallel : public QIWithRetranslateUI<QWidget>,
    72                                public Ui::UIMachineSettingsParallel
     89                                  public Ui::UIMachineSettingsParallel
    7390{
    7491    Q_OBJECT;
    … …  
    106123};
    107124
    108 /* Machine settings / Parallel page: */
     125
     126/** Machine settings: Parallel page. */
    109127class UIMachineSettingsParallelPage : public UISettingsPageMachine
    110128{
    … …  
    150168};
    151169
    152 #endif // __UIMachineSettingsParallel_h__
     170#endif /* !___UIMachineSettingsParallel_h___ */
    153171

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2008-2016 Oracle Corporation
     7 * Copyright (C) 2008-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsSF_h__
    19 #define __UIMachineSettingsSF_h__
     18#ifndef ___UIMachineSettingsSF_h___
     19#define ___UIMachineSettingsSF_h___
    2020
    2121/* GUI includes: */
    … …  
    3333typedef QList <SFolderName> SFoldersNameList;
    3434
    35 /* Machine settings / Shared Folders page / Shared Folder data: */
     35
     36/** Machine settings: Shared Folder data structure. */
    3637struct UIDataSettingsSharedFolder
    3738{
    38     /* Default constructor: */
     39    /** Constructs data. */
    3940    UIDataSettingsSharedFolder()
    4041        : m_type(MachineType)
    … …  
    4243        , m_strHostPath(QString())
    4344        , m_fAutoMount(false)
    44         , m_fWritable(false) {}
    45     /* Functions: */
     45        , m_fWritable(false)
     46    {}
     47
     48    /** Returns whether the @a other passed data is equal to this one. */
    4649    bool equal(const UIDataSettingsSharedFolder &other) const
    4750    {
    48         return (m_type == other.m_type) &&
    49                (m_strName == other.m_strName) &&
    50                (m_strHostPath == other.m_strHostPath) &&
    51                (m_fAutoMount == other.m_fAutoMount) &&
    52                (m_fWritable == other.m_fWritable);
     51        return true
     52               && (m_type == other.m_type)
     53               && (m_strName == other.m_strName)
     54               && (m_strHostPath == other.m_strHostPath)
     55               && (m_fAutoMount == other.m_fAutoMount)
     56               && (m_fWritable == other.m_fWritable)
     57               ;
    5358    }
    54     /* Operators: */
     59
     60    /** Returns whether the @a other passed data is equal to this one. */
    5561    bool operator==(const UIDataSettingsSharedFolder &other) const { return equal(other); }
     62    /** Returns whether the @a other passed data is different from this one. */
    5663    bool operator!=(const UIDataSettingsSharedFolder &other) const { return !equal(other); }
    57     /* Variables: */
    58     UISharedFolderType m_type;
    59     QString m_strName;
    60     QString m_strHostPath;
    61     bool m_fAutoMount;
    62     bool m_fWritable;
     64
     65    /** Holds the shared folder type. */
     66    UISharedFolderType  m_type;
     67    /** Holds the shared folder name. */
     68    QString             m_strName;
     69    /** Holds the shared folder path. */
     70    QString             m_strHostPath;
     71    /** Holds whether the shared folder should be auto-mounted at startup. */
     72    bool                m_fAutoMount;
     73    /** Holds whether the shared folder should be writeable. */
     74    bool                m_fWritable;
    6375};
    6476typedef UISettingsCache<UIDataSettingsSharedFolder> UISettingsCacheSharedFolder;
    6577
    66 /* Machine settings / Shared Folders page / Shared Folders data: */
     78
     79/** Machine settings: Shared Folders page data structure. */
    6780struct UIDataSettingsSharedFolders
    6881{
    69     /* Default constructor: */
     82    /** Constructs data. */
    7083    UIDataSettingsSharedFolders() {}
    71     /* Operators: */
    72     bool operator==(const UIDataSettingsSharedFolders& /* other */) const { return true; }
    73     bool operator!=(const UIDataSettingsSharedFolders& /* other */) const { return false; }
     84
     85    /** Returns whether the @a other passed data is equal to this one. */
     86    bool operator==(const UIDataSettingsSharedFolders & /* other */) const { return true; }
     87    /** Returns whether the @a other passed data is different from this one. */
     88    bool operator!=(const UIDataSettingsSharedFolders & /* other */) const { return false; }
    7489};
    7590typedef UISettingsCachePool<UIDataSettingsSharedFolders, UISettingsCacheSharedFolder> UISettingsCacheSharedFolders;
    7691
     92
     93/** Machine settings: Shared Folders page. */
    7794class UIMachineSettingsSF : public UISettingsPageMachine,
    78                          public Ui::UIMachineSettingsSF
     95                            public Ui::UIMachineSettingsSF
    7996{
    8097    Q_OBJECT;
    … …  
    157174};
    158175
    159 #endif // __UIMachineSettingsSF_h__
     176#endif /* !___UIMachineSettingsSF_h___ */
    160177

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsSerial_h__
    19 #define __UIMachineSettingsSerial_h__
     18#ifndef ___UIMachineSettingsSerial_h___
     19#define ___UIMachineSettingsSerial_h___
    2020
    2121/* GUI includes: */
    … …  
    2323#include "UIMachineSettingsSerial.gen.h"
    2424
    25 /* Forward declarations */
     25/* Forward declarations: */
    2626class UIMachineSettingsSerialPage;
    2727class QITabWidget;
    2828
    29 /* Machine settings / Serial page / Port data: */
     29
     30/** Machine settings: Serial Port tab data structure. */
    3031struct UIDataSettingsMachineSerialPort
    3132{
    32     /* Default constructor: */
     33    /** Constructs data. */
    3334    UIDataSettingsMachineSerialPort()
    3435        : m_iSlot(-1)
    … …  
    3839        , m_hostMode(KPortMode_Disconnected)
    3940        , m_fServer(false)
    40         , m_strPath(QString()) {}
    41     /* Functions: */
     41        , m_strPath(QString())
     42    {}
     43
     44    /** Returns whether the @a other passed data is equal to this one. */
    4245    bool equal(const UIDataSettingsMachineSerialPort &other) const
    4346    {
    44         return (m_iSlot == other.m_iSlot) &&
    45                (m_fPortEnabled == other.m_fPortEnabled) &&
    46                (m_uIRQ == other.m_uIRQ) &&
    47                (m_uIOBase == other.m_uIOBase) &&
    48                (m_hostMode == other.m_hostMode) &&
    49                (m_fServer == other.m_fServer) &&
    50                (m_strPath == other.m_strPath);
     47        return true
     48               && (m_iSlot == other.m_iSlot)
     49               && (m_fPortEnabled == other.m_fPortEnabled)
     50               && (m_uIRQ == other.m_uIRQ)
     51               && (m_uIOBase == other.m_uIOBase)
     52               && (m_hostMode == other.m_hostMode)
     53               && (m_fServer == other.m_fServer)
     54               && (m_strPath == other.m_strPath)
     55               ;
    5156    }
    52     /* Operators: */
     57
     58    /** Returns whether the @a other passed data is equal to this one. */
    5359    bool operator==(const UIDataSettingsMachineSerialPort &other) const { return equal(other); }
     60    /** Returns whether the @a other passed data is different from this one. */
    5461    bool operator!=(const UIDataSettingsMachineSerialPort &other) const { return !equal(other); }
    55     /* Variables: */
    56     int m_iSlot;
    57     bool m_fPortEnabled;
    58     ulong m_uIRQ;
    59     ulong m_uIOBase;
    60     KPortMode m_hostMode;
    61     bool m_fServer;
    62     QString m_strPath;
     62
     63    /** Holds the serial port slot number. */
     64    int        m_iSlot;
     65    /** Holds whether the serial port is enabled. */
     66    bool       m_fPortEnabled;
     67    /** Holds the serial port IRQ. */
     68    ulong      m_uIRQ;
     69    /** Holds the serial port IO base. */
     70    ulong      m_uIOBase;
     71    /** Holds the serial port host mode. */
     72    KPortMode  m_hostMode;
     73    /** Holds whether the serial port is server. */
     74    bool       m_fServer;
     75    /** Holds the serial port path. */
     76    QString    m_strPath;
    6377};
    6478typedef UISettingsCache<UIDataSettingsMachineSerialPort> UISettingsCacheMachineSerialPort;
    6579
    66 /* Machine settings / Serial page / Ports data: */
     80
     81/** Machine settings: Serial page data structure. */
    6782struct UIDataSettingsMachineSerial
    6883{
    69     /* Default constructor: */
     84    /** Constructs data. */
    7085    UIDataSettingsMachineSerial() {}
    71     /* Operators: */
    72     bool operator==(const UIDataSettingsMachineSerial& /* other */) const { return true; }
    73     bool operator!=(const UIDataSettingsMachineSerial& /* other */) const { return false; }
     86
     87    /** Returns whether the @a other passed data is equal to this one. */
     88    bool operator==(const UIDataSettingsMachineSerial & /* other */) const { return true; }
     89    /** Returns whether the @a other passed data is different from this one. */
     90    bool operator!=(const UIDataSettingsMachineSerial & /* other */) const { return false; }
    7491};
    7592typedef UISettingsCachePool<UIDataSettingsMachineSerial, UISettingsCacheMachineSerialPort> UISettingsCacheMachineSerial;
    7693
     94
     95/** Machine settings: Serial Port tab. */
    7796class UIMachineSettingsSerial : public QIWithRetranslateUI<QWidget>,
    78                              public Ui::UIMachineSettingsSerial
     97                                public Ui::UIMachineSettingsSerial
    7998{
    8099    Q_OBJECT;
    … …  
    113132};
    114133
    115 /* Machine settings / Serial page: */
     134
     135/** Machine settings: Serial page. */
    116136class UIMachineSettingsSerialPage : public UISettingsPageMachine
    117137{
    … …  
    157177};
    158178
    159 #endif // __UIMachineSettingsSerial_h__
     179#endif /* !___UIMachineSettingsSerial_h___ */
    160180

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsStorage_h__
    19 #define __UIMachineSettingsStorage_h__
     18#ifndef ___UIMachineSettingsStorage_h___
     19#define ___UIMachineSettingsStorage_h___
    2020
    2121/* Qt includes: */
    … …  
    588588};
    589589
    590 /* Machine settings / Storage page / Storage attachment data: */
     590
     591/** Machine settings: Storage Attachment data structure. */
    591592struct UIDataSettingsMachineStorageAttachment
    592593{
    593     /* Default constructor: */
     594    /** Constructs data. */
    594595    UIDataSettingsMachineStorageAttachment()
    595596        : m_attachmentType(KDeviceType_Null)
    … …  
    602603        , m_fAttachmentHotPluggable(false)
    603604    {}
    604     /* Functions: */
     605
     606    /** Returns whether the @a other passed data is equal to this one. */
    605607    bool equal(const UIDataSettingsMachineStorageAttachment &other) const
    606608    {
    607         return (m_attachmentType == other.m_attachmentType) &&
    608                (m_iAttachmentPort == other.m_iAttachmentPort) &&
    609                (m_iAttachmentDevice == other.m_iAttachmentDevice) &&
    610                (m_strAttachmentMediumId == other.m_strAttachmentMediumId) &&
    611                (m_fAttachmentPassthrough == other.m_fAttachmentPassthrough) &&
    612                (m_fAttachmentTempEject == other.m_fAttachmentTempEject) &&
    613                (m_fAttachmentNonRotational == other.m_fAttachmentNonRotational) &&
    614                (m_fAttachmentHotPluggable == other.m_fAttachmentHotPluggable);
     609        return true
     610               && (m_attachmentType == other.m_attachmentType)
     611               && (m_iAttachmentPort == other.m_iAttachmentPort)
     612               && (m_iAttachmentDevice == other.m_iAttachmentDevice)
     613               && (m_strAttachmentMediumId == other.m_strAttachmentMediumId)
     614               && (m_fAttachmentPassthrough == other.m_fAttachmentPassthrough)
     615               && (m_fAttachmentTempEject == other.m_fAttachmentTempEject)
     616               && (m_fAttachmentNonRotational == other.m_fAttachmentNonRotational)
     617               && (m_fAttachmentHotPluggable == other.m_fAttachmentHotPluggable)
     618               ;
    615619    }
    616     /* Operators: */
     620
     621    /** Returns whether the @a other passed data is equal to this one. */
    617622    bool operator==(const UIDataSettingsMachineStorageAttachment &other) const { return equal(other); }
     623    /** Returns whether the @a other passed data is different from this one. */
    618624    bool operator!=(const UIDataSettingsMachineStorageAttachment &other) const { return !equal(other); }
    619     /* Variables: */
    620     KDeviceType m_attachmentType;
    621     LONG m_iAttachmentPort;
    622     LONG m_iAttachmentDevice;
    623     QString m_strAttachmentMediumId;
    624     bool m_fAttachmentPassthrough;
    625     bool m_fAttachmentTempEject;
    626     bool m_fAttachmentNonRotational;
    627     bool m_fAttachmentHotPluggable;
     625
     626    /** Holds the attachment type. */
     627    KDeviceType  m_attachmentType;
     628    /** Holds the attachment port. */
     629    LONG         m_iAttachmentPort;
     630    /** Holds the attachment device. */
     631    LONG         m_iAttachmentDevice;
     632    /** Holds the attachment medium ID. */
     633    QString      m_strAttachmentMediumId;
     634    /** Holds whether the attachment being passed through. */
     635    bool         m_fAttachmentPassthrough;
     636    /** Holds whether the attachment being temporarily eject. */
     637    bool         m_fAttachmentTempEject;
     638    /** Holds whether the attachment is solid-state. */
     639    bool         m_fAttachmentNonRotational;
     640    /** Holds whether the attachment is hot-pluggable. */
     641    bool         m_fAttachmentHotPluggable;
    628642};
    629643typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UISettingsCacheMachineStorageAttachment;
    630644
    631 /* Machine settings / Storage page / Storage controller data: */
     645
     646/** Machine settings: Storage Controller data structure. */
    632647struct UIDataSettingsMachineStorageController
    633648{
    634     /* Default constructor: */
     649    /** Constructs data. */
    635650    UIDataSettingsMachineStorageController()
    636651        : m_strControllerName(QString())
    … …  
    638653        , m_controllerType(KStorageControllerType_Null)
    639654        , m_uPortCount(0)
    640         , m_fUseHostIOCache(false) {}
    641     /* Functions: */
     655        , m_fUseHostIOCache(false)
     656    {}
     657
     658    /** Returns whether the @a other passed data is equal to this one. */
    642659    bool equal(const UIDataSettingsMachineStorageController &other) const
    643660    {
    644         return (m_strControllerName == other.m_strControllerName) &&
    645                (m_controllerBus == other.m_controllerBus) &&
    646                (m_controllerType == other.m_controllerType) &&
    647                (m_uPortCount == other.m_uPortCount) &&
    648                (m_fUseHostIOCache == other.m_fUseHostIOCache);
     661        return true
     662               && (m_strControllerName == other.m_strControllerName)
     663               && (m_controllerBus == other.m_controllerBus)
     664               && (m_controllerType == other.m_controllerType)
     665               && (m_uPortCount == other.m_uPortCount)
     666               && (m_fUseHostIOCache == other.m_fUseHostIOCache)
     667               ;
    649668    }
    650     /* Operators: */
     669
     670    /** Returns whether the @a other passed data is equal to this one. */
    651671    bool operator==(const UIDataSettingsMachineStorageController &other) const { return equal(other); }
     672    /** Returns whether the @a other passed data is different from this one. */
    652673    bool operator!=(const UIDataSettingsMachineStorageController &other) const { return !equal(other); }
    653     /* Variables: */
    654     QString m_strControllerName;
    655     KStorageBus m_controllerBus;
    656     KStorageControllerType m_controllerType;
    657     uint m_uPortCount;
    658     bool m_fUseHostIOCache;
     674
     675    /** Holds the controller name. */
     676    QString                 m_strControllerName;
     677    /** Holds the controller bus. */
     678    KStorageBus             m_controllerBus;
     679    /** Holds the controller type. */
     680    KStorageControllerType  m_controllerType;
     681    /** Holds the controller port count. */
     682    uint                    m_uPortCount;
     683    /** Holds whether the controller uses host IO cache. */
     684    bool                    m_fUseHostIOCache;
    659685};
    660686typedef UISettingsCachePool<UIDataSettingsMachineStorageController, UISettingsCacheMachineStorageAttachment> UISettingsCacheMachineStorageController;
    661687
    662 /* Machine settings / Storage page / Storage data: */
     688
     689/** Machine settings: Storage page data structure. */
    663690struct UIDataSettingsMachineStorage
    664691{
    665     /* Default constructor: */
     692    /** Constructs data. */
    666693    UIDataSettingsMachineStorage() {}
    667     /* Operators: */
     694
     695    /** Returns whether the @a other passed data is equal to this one. */
    668696    bool operator==(const UIDataSettingsMachineStorage& /* other */) const { return true; }
     697    /** Returns whether the @a other passed data is different from this one. */
    669698    bool operator!=(const UIDataSettingsMachineStorage& /* other */) const { return false; }
    670699};
    671700typedef UISettingsCachePool<UIDataSettingsMachineStorage, UISettingsCacheMachineStorageController> UISettingsCacheMachineStorage;
    672701
    673 /* Machine settings / Storage page: */
     702
     703/** Machine settings: Storage page. */
    674704class UIMachineSettingsStorage : public UISettingsPageMachine,
    675                          public Ui::UIMachineSettingsStorage
     705                                 public Ui::UIMachineSettingsStorage
    676706{
    677707    Q_OBJECT;
    … …  
    831861};
    832862
    833 #endif // __UIMachineSettingsStorage_h__
    834 
     863#endif /* !___UIMachineSettingsStorage_h___ */
     864

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2008-2016 Oracle Corporation
     7 * Copyright (C) 2008-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsSystem_h__
    19 #define __UIMachineSettingsSystem_h__
     18#ifndef ___UIMachineSettingsSystem_h___
     19#define ___UIMachineSettingsSystem_h___
    2020
    2121/* GUI includes: */
    … …  
    2323#include "UIMachineSettingsSystem.gen.h"
    2424
    25 /* Machine settings / System page / Data / Boot item: */
     25
     26/** Machine settings: System Boot data structure. */
    2627struct UIBootItemData
    2728{
    28     /* Constructor: */
    29     UIBootItemData() : m_type(KDeviceType_Null), m_fEnabled(false) {}
    30 
    31     /* Operator==: */
     29    /** Constructs data. */
     30    UIBootItemData()
     31        : m_type(KDeviceType_Null)
     32        , m_fEnabled(false)
     33    {}
     34
     35    /** Returns whether the @a other passed data is equal to this one. */
    3236    bool operator==(const UIBootItemData &other) const
    3337    {
    34         return (m_type == other.m_type) &&
    35                (m_fEnabled == other.m_fEnabled);
     38        return true
     39               && (m_type == other.m_type)
     40               && (m_fEnabled == other.m_fEnabled)
     41               ;
    3642    }
    3743
    38     /* Variables: */
     44    /** Holds the boot device type. */
    3945    KDeviceType m_type;
     46    /** Holds whether the boot device enabled. */
    4047    bool m_fEnabled;
    4148};
    4249
    43 /* Machine settings / System page / Data: */
     50
     51/** Machine settings: System page data structure. */
    4452struct UIDataSettingsMachineSystem
    4553{
    46     /* Constructor: */
     54    /** Constructs data. */
    4755    UIDataSettingsMachineSystem()
    4856        /* Support flags: */
    … …  
    6775    {}
    6876
    69     /* Functions: */
     77    /** Returns whether the @a other passed data is equal to this one. */
    7078    bool equal(const UIDataSettingsMachineSystem &other) const
    7179    {
    72         return /* Support flags: */
    73                (m_fSupportedPAE == other.m_fSupportedPAE) &&
    74                (m_fSupportedHwVirtEx == other.m_fSupportedHwVirtEx) &&
     80        return true
     81               /* Support flags: */
     82               && (m_fSupportedPAE == other.m_fSupportedPAE)
     83               && (m_fSupportedHwVirtEx == other.m_fSupportedHwVirtEx)
    7584               /* Motherboard data: */
    76                (m_iMemorySize == other.m_iMemorySize) &&
    77                (m_bootItems == other.m_bootItems) &&
    78                (m_chipsetType == other.m_chipsetType) &&
    79                (m_pointingHIDType == other.m_pointingHIDType) &&
    80                (m_fEnabledIoApic == other.m_fEnabledIoApic) &&
    81                (m_fEnabledEFI == other.m_fEnabledEFI) &&
    82                (m_fEnabledUTC == other.m_fEnabledUTC) &&
     85               && (m_iMemorySize == other.m_iMemorySize)
     86               && (m_bootItems == other.m_bootItems)
     87               && (m_chipsetType == other.m_chipsetType)
     88               && (m_pointingHIDType == other.m_pointingHIDType)
     89               && (m_fEnabledIoApic == other.m_fEnabledIoApic)
     90               && (m_fEnabledEFI == other.m_fEnabledEFI)
     91               && (m_fEnabledUTC == other.m_fEnabledUTC)
    8392               /* CPU data: */
    84                (m_cCPUCount == other.m_cCPUCount) &&
    85                (m_iCPUExecCap == other.m_iCPUExecCap) &&
    86                (m_fEnabledPAE == other.m_fEnabledPAE) &&
    87                 /* Acceleration data: */
    88                (m_paravirtProvider == other.m_paravirtProvider) &&
    89                (m_fEnabledHwVirtEx == other.m_fEnabledHwVirtEx) &&
    90                (m_fEnabledNestedPaging == other.m_fEnabledNestedPaging);
     93               && (m_cCPUCount == other.m_cCPUCount)
     94               && (m_iCPUExecCap == other.m_iCPUExecCap)
     95               && (m_fEnabledPAE == other.m_fEnabledPAE)
     96               /* Acceleration data: */
     97               && (m_paravirtProvider == other.m_paravirtProvider)
     98               && (m_fEnabledHwVirtEx == other.m_fEnabledHwVirtEx)
     99               && (m_fEnabledNestedPaging == other.m_fEnabledNestedPaging)
     100               ;
    91101    }
    92102
    93     /* Operators: */
     103    /** Returns whether the @a other passed data is equal to this one. */
    94104    bool operator==(const UIDataSettingsMachineSystem &other) const { return equal(other); }
     105    /** Returns whether the @a other passed data is different from this one. */
    95106    bool operator!=(const UIDataSettingsMachineSystem &other) const { return !equal(other); }
    96107
    97     /* Variables: Support flags: */
    98     bool m_fSupportedPAE;
    99     bool m_fSupportedHwVirtEx;
    100 
    101     /* Variables: Motherboard data: */
    102     int m_iMemorySize;
    103     QList<UIBootItemData> m_bootItems;
    104     KChipsetType m_chipsetType;
    105     KPointingHIDType m_pointingHIDType;
    106     bool m_fEnabledIoApic;
    107     bool m_fEnabledEFI;
    108     bool m_fEnabledUTC;
    109     /* Variables: CPU data: */
    110     int m_cCPUCount;
    111     int m_iCPUExecCap;
    112     bool m_fEnabledPAE;
    113     /* Variables: Acceleration data: */
    114     KParavirtProvider m_paravirtProvider;
    115     bool m_fEnabledHwVirtEx;
    116     bool m_fEnabledNestedPaging;
     108    /** Holds whether the PAE is supported. */
     109    bool  m_fSupportedPAE;
     110    /** Holds whether the HW Virt Ex is supported. */
     111    bool  m_fSupportedHwVirtEx;
     112
     113    /** Holds the RAM size. */
     114    int                    m_iMemorySize;
     115    /** Holds the boot items. */
     116    QList<UIBootItemData>  m_bootItems;
     117    /** Holds the chipset type. */
     118    KChipsetType           m_chipsetType;
     119    /** Holds the pointing HID type. */
     120    KPointingHIDType       m_pointingHIDType;
     121    /** Holds whether the IO APIC is enabled. */
     122    bool                   m_fEnabledIoApic;
     123    /** Holds whether the EFI is enabled. */
     124    bool                   m_fEnabledEFI;
     125    /** Holds whether the UTC is enabled. */
     126    bool                   m_fEnabledUTC;
     127
     128    /** Holds the CPU count. */
     129    int   m_cCPUCount;
     130    /** Holds the CPU execution cap. */
     131    int   m_iCPUExecCap;
     132    /** Holds whether the PAE is enabled. */
     133    bool  m_fEnabledPAE;
     134
     135    /** Holds the paravirtualization provider. */
     136    KParavirtProvider  m_paravirtProvider;
     137    /** Holds whether the HW Virt Ex is enabled. */
     138    bool               m_fEnabledHwVirtEx;
     139    /** Holds whether the Nested Paging is enabled. */
     140    bool               m_fEnabledNestedPaging;
    117141};
    118142typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
    119143
    120 /* Machine settings / System page: */
     144
     145/** Machine settings: System page. */
    121146class UIMachineSettingsSystem : public UISettingsPageMachine,
    122147                                public Ui::UIMachineSettingsSystem
    … …  
    221246};
    222247
    223 #endif // __UIMachineSettingsSystem_h__
     248#endif /* !___UIMachineSettingsSystem_h___ */
     249

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

    r66163 r66176  
    55
    66/*
    7  * Copyright (C) 2006-2016 Oracle Corporation
     7 * Copyright (C) 2006-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 */
    1717
    18 #ifndef __UIMachineSettingsUSB_h__
    19 #define __UIMachineSettingsUSB_h__
     18#ifndef ___UIMachineSettingsUSB_h___
     19#define ___UIMachineSettingsUSB_h___
    2020
    2121/* GUI includes: */
    … …  
    2727class UIToolBar;
    2828
    29 /* Common settings / USB page / USB filter data: */
     29
     30/** Machine settings: USB filter data structure. */
    3031struct UIDataSettingsMachineUSBFilter
    3132{
    32     /* Default constructor: */
     33    /** Constructs data. */
    3334    UIDataSettingsMachineUSBFilter()
    3435        : m_fActive(false)
    … …  
    4445        , m_action(KUSBDeviceFilterAction_Null)
    4546        , m_fHostUSBDevice(false)
    46         , m_hostUSBDeviceState(KUSBDeviceState_NotSupported) {}
    47     /* Functions: */
     47        , m_hostUSBDeviceState(KUSBDeviceState_NotSupported)
     48    {}
     49
     50    /** Returns whether the @a other passed data is equal to this one. */
    4851    bool equal(const UIDataSettingsMachineUSBFilter &other) const
    4952    {
    50         return (m_fActive == other.m_fActive) &&
    51                (m_strName == other.m_strName) &&
    52                (m_strVendorId == other.m_strVendorId) &&
    53                (m_strProductId == other.m_strProductId) &&
    54                (m_strRevision == other.m_strRevision) &&
    55                (m_strManufacturer == other.m_strManufacturer) &&
    56                (m_strProduct == other.m_strProduct) &&
    57                (m_strSerialNumber == other.m_strSerialNumber) &&
    58                (m_strPort == other.m_strPort) &&
    59                (m_strRemote == other.m_strRemote) &&
    60                (m_action == other.m_action) &&
    61                (m_hostUSBDeviceState == other.m_hostUSBDeviceState);
     53        return true
     54               && (m_fActive == other.m_fActive)
     55               && (m_strName == other.m_strName)
     56               && (m_strVendorId == other.m_strVendorId)
     57               && (m_strProductId == other.m_strProductId)
     58               && (m_strRevision == other.m_strRevision)
     59               && (m_strManufacturer == other.m_strManufacturer)
     60               && (m_strProduct == other.m_strProduct)
     61               && (m_strSerialNumber == other.m_strSerialNumber)
     62               && (m_strPort == other.m_strPort)
     63               && (m_strRemote == other.m_strRemote)
     64               && (m_action == other.m_action)
     65               && (m_hostUSBDeviceState == other.m_hostUSBDeviceState)
     66               ;
    6267    }
    63     /* Operators: */
     68
     69    /** Returns whether the @a other passed data is equal to this one. */
    6470    bool operator==(const UIDataSettingsMachineUSBFilter &other) const { return equal(other); }
     71    /** Returns whether the @a other passed data is different from this one. */
    6572    bool operator!=(const UIDataSettingsMachineUSBFilter &other) const { return !equal(other); }
    66     /* Common variables: */
    67     bool m_fActive;
    68     QString m_strName;
    69     QString m_strVendorId;
    70     QString m_strProductId;
    71     QString m_strRevision;
    72     QString m_strManufacturer;
    73     QString m_strProduct;
    74     QString m_strSerialNumber;
    75     QString m_strPort;
    76     QString m_strRemote;
    77     /* Host only variables: */
    78     KUSBDeviceFilterAction m_action;
    79     bool m_fHostUSBDevice;
    80     KUSBDeviceState m_hostUSBDeviceState;
     73
     74    /** Holds whether the USB filter is enabled. */
     75    bool     m_fActive;
     76    /** Holds the USB filter name. */
     77    QString  m_strName;
     78    /** Holds the USB filter vendor ID. */
     79    QString  m_strVendorId;
     80    /** Holds the USB filter product ID. */
     81    QString  m_strProductId;
     82    /** Holds the USB filter revision. */
     83    QString  m_strRevision;
     84    /** Holds the USB filter manufacturer. */
     85    QString  m_strManufacturer;
     86    /** Holds the USB filter product. */
     87    QString  m_strProduct;
     88    /** Holds the USB filter serial number. */
     89    QString  m_strSerialNumber;
     90    /** Holds the USB filter port. */
     91    QString  m_strPort;
     92    /** Holds the USB filter remote. */
     93    QString  m_strRemote;
     94
     95    /** Holds the USB filter action. */
     96    KUSBDeviceFilterAction  m_action;
     97    /** Holds whether the USB filter is host USB device. */
     98    bool                    m_fHostUSBDevice;
     99    /** Holds the USB device state. */
     100    KUSBDeviceState         m_hostUSBDeviceState;
    81101};
    82102typedef UISettingsCache<UIDataSettingsMachineUSBFilter> UISettingsCacheMachineUSBFilter;
    83103
    84 /* Common settings / USB page / USB data: */
     104
     105/** Machine settings: USB page data structure. */
    85106struct UIDataSettingsMachineUSB
    86107{
    87     /* Default constructor: */
     108    /** Constructs data. */
    88109    UIDataSettingsMachineUSB()
    89110        : m_fUSBEnabled(false)
    90         , m_USBControllerType(KUSBControllerType_Null) {}
    91     /* Functions: */
     111        , m_USBControllerType(KUSBControllerType_Null)
     112    {}
     113
     114    /** Returns whether the @a other passed data is equal to this one. */
    92115    bool equal(const UIDataSettingsMachineUSB &other) const
    93116    {
    94         return (m_fUSBEnabled == other.m_fUSBEnabled) &&
    95                (m_USBControllerType == other.m_USBControllerType);
     117        return true
     118               && (m_fUSBEnabled == other.m_fUSBEnabled)
     119               && (m_USBControllerType == other.m_USBControllerType)
     120               ;
    96121    }
    97     /* Operators: */
     122
     123    /** Returns whether the @a other passed data is equal to this one. */
    98124    bool operator==(const UIDataSettingsMachineUSB &other) const { return equal(other); }
     125    /** Returns whether the @a other passed data is different from this one. */
    99126    bool operator!=(const UIDataSettingsMachineUSB &other) const { return !equal(other); }
    100     /* Variables: */
     127
     128    /** Holds whether the USB is enabled. */
    101129    bool m_fUSBEnabled;
     130    /** Holds the USB controller type. */
    102131    KUSBControllerType m_USBControllerType;
    103132};
    104133typedef UISettingsCachePool<UIDataSettingsMachineUSB, UISettingsCacheMachineUSBFilter> UISettingsCacheMachineUSB;
    105134
    106 /* Common settings / USB page: */
     135
     136/** Machine settings: USB page. */
    107137class UIMachineSettingsUSB : public UISettingsPageMachine,
    108138                             public Ui::UIMachineSettingsUSB
    … …  
    195225};
    196226
    197 #endif // __UIMachineSettingsUSB_h__
    198 
     227#endif /* !___UIMachineSettingsUSB_h___ */
     228
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