VirtualBox

Changeset 103977 in vbox for trunk


Ignore:
Timestamp:
Mar 21, 2024 2:04:52 AM (12 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
162357
Message:

Apply RT_OVERRIDE/NS_OVERRIDE where required to shut up clang.

Location:
trunk
Files:
83 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/com/microatl.h

    r99828 r103977  
    130130        return _aInterfaces; \
    131131    } \
    132     virtual ULONG STDMETHODCALLTYPE AddRef(void) throw() = 0; \
    133     virtual ULONG STDMETHODCALLTYPE Release(void) throw() = 0; \
    134     STDMETHOD(QueryInterface)(REFIID, void **) throw() = 0;
     132    virtual ULONG STDMETHODCALLTYPE AddRef(void) throw() RT_OVERRIDE = 0; \
     133    virtual ULONG STDMETHODCALLTYPE Release(void) throw() RT_OVERRIDE = 0; \
     134    STDMETHOD(QueryInterface)(REFIID, void **) throw() RT_OVERRIDE = 0;
    135135
    136136struct _ATL_OBJMAP_ENTRY

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.h

    r98103 r103977  
    7272
    7373    /** Executes the dialog. */
    74     int exec();
     74    int exec() RT_OVERRIDE;
    7575
    7676    /** Handles scroll-bar moving by a certain @a iValue. */

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

    r103943 r103977  
    383383    QVariant data(const QModelIndex &index, int role) const RT_OVERRIDE;
    384384    void clearData();
    385     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     385    QVariant headerData(int section, Qt::Orientation orientation, int role) const RT_OVERRIDE;
    386386    void setColumnCaptions(const QMap<int, QString>& captions);
    387387    void setColumnVisible(const QMap<int, bool>& columnVisible);

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h

    r98103 r103977  
    6666
    6767    /** Returns minimum size-hint. */
    68     QSize minimumSizeHint() const;
     68    QSize minimumSizeHint() const RT_OVERRIDE;
    6969
    7070    /** Defines the @a strName for the switch-button. */

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h

    r100871 r103977  
    5454
    5555    /** Defines whether the dialog is @a fVisible. */
    56     void setVisible(bool fVisible);
     56    void setVisible(bool fVisible) RT_OVERRIDE;
    5757
    5858public slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h

    r98103 r103977  
    7878
    7979    /** Defines whether the dialog is @a fVisible. */
    80     virtual void setVisible(bool fVisible);
     80    virtual void setVisible(bool fVisible) RT_OVERRIDE;
    8181
    8282protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.h

    r98103 r103977  
    6666
    6767    /** Returns size-hint. */
    68     virtual QSize sizeHint() const { return m_size.isValid() ? m_size : QWidget::sizeHint(); }
     68    virtual QSize sizeHint() const RT_OVERRIDE { return m_size.isValid() ? m_size : QWidget::sizeHint(); }
    6969
    7070protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.h

    r98103 r103977  
    135135
    136136    /** Returns child rectangle. */
    137     QRect visualRect(const QModelIndex &index) const { return QTreeView::visualRect(index); }
     137    QRect visualRect(const QModelIndex &index) const RT_OVERRIDE { return QTreeView::visualRect(index); }
    138138
    139139protected slots:
    140140
    141141    /** Handles index changed from @a previous to @a current.*/
    142     void currentChanged(const QModelIndex &current, const QModelIndex &previous);
     142    void currentChanged(const QModelIndex &current, const QModelIndex &previous) RT_OVERRIDE;
    143143
    144144protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIFileSystemModel.h

    r103803 r103977  
    199199
    200200    QVariant       data(const QModelIndex &index, int role) const RT_OVERRIDE;
    201     bool           setData(const QModelIndex &index, const QVariant &value, int role);
     201    bool           setData(const QModelIndex &index, const QVariant &value, int role) RT_OVERRIDE;
    202202
    203203    Qt::ItemFlags  flags(const QModelIndex &index) const RT_OVERRIDE;

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

    r101020 r103977  
    112112protected:
    113113
    114     void retranslateUi();
     114    virtual void retranslateUi() RT_OVERRIDE;
    115115
    116116private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

    r103803 r103977  
    208208    };
    209209
    210     void retranslateUi();
     210    void retranslateUi() RT_OVERRIDE;
    211211    void updateCurrentLocationEdit(const QString& strLocation);
    212212    /* @p index is for model not for 'proxy' model */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.h

    r103803 r103977  
    6565protected:
    6666
    67     void retranslateUi();
     67    virtual void retranslateUi() RT_OVERRIDE;
    6868
    6969private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

    r103803 r103977  
    131131
    132132    void prepare();
    133     void retranslateUi();
     133    virtual void retranslateUi() RT_OVERRIDE;
    134134    UISearchLineEdit  *m_pSearchLineEdit;
    135135    QIToolButton      *m_pNextButton;

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

    r101571 r103977  
    9393    void sltSelectPreviousMatch();
    9494    void sltSelectNextMatch();
    95     virtual void reload() /* overload */;
     95    virtual void reload() RT_OVERRIDE;
    9696
    9797protected:
    … …  
    130130    };
    131131
    132     void retranslateUi();
     132    virtual void retranslateUi() RT_OVERRIDE;
    133133    bool isRectInside(const QRect &rect, int iMargin) const;
    134134    void moveFindWidgetIn(int iMargin);

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterWidget.cpp

    r103923 r103977  
    8686    /* Override the mousePressEvent to control how selection is done: */
    8787    virtual void        mousePressEvent(QMouseEvent * event) RT_OVERRIDE;
    88     virtual void        mouseReleaseEvent(QMouseEvent *){}
     88    virtual void        mouseReleaseEvent(QMouseEvent *) RT_OVERRIDE {}
    8989    virtual void        paintEvent(QPaintEvent *event) RT_OVERRIDE;
    9090

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.h

    r103803 r103977  
    101101
    102102    /** Performs translation. */
    103     virtual void retranslateUi();
     103    virtual void retranslateUi() RT_OVERRIDE;
    104104
    105105    /** Updates appearance. */
    106     virtual void updateAppearance();
     106    virtual void updateAppearance() RT_OVERRIDE;
    107107
    108108    /** Creates update task. */
    … …  
    143143
    144144    /** Performs translation. */
    145     virtual void retranslateUi();
     145    virtual void retranslateUi() RT_OVERRIDE;
    146146
    147147    /** Returns minimum width hint. */
    148     int minimumWidthHint() const;
     148    int minimumWidthHint() const RT_OVERRIDE;
    149149    /** Returns minimum height hint.
    150150      * @param fClosed allows to specify whether the hint should
    151151      *                be calculated for the closed element. */
    152     int minimumHeightHintForElement(bool fClosed) const;
     152    int minimumHeightHintForElement(bool fClosed) const RT_OVERRIDE;
    153153
    154154    /** Updates appearance. */
    155     void updateAppearance();
     155    void updateAppearance() RT_OVERRIDE;
    156156
    157157    /** Holds the instance of VM preview. */

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.h

    r98103 r103977  
    111111
    112112    /** Returns whether <i>this</i> item is less than @a other one. */
    113     bool operator<(const QTreeWidgetItem &other) const;
     113    bool operator<(const QTreeWidgetItem &other) const RT_OVERRIDE;
    114114    /** Returns whether the medium can be modified. For
    115115      * simplicity's sake this returns false if one of the attached vms is not

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

    r103651 r103977  
    8686private:
    8787
    88     void prepare();
     88    void prepare() RT_OVERRIDE;
    8989    void prepareConnections();
    9090

  • trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloader.h

    r98103 r103977  
    112112
    113113    /** Returns description of the current network operation. */
    114     virtual QString description() const;
     114    virtual QString description() const RT_OVERRIDE;
    115115
    116116    /** Handles network-reply progress for @a iReceived bytes of @a iTotal. */

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObject.h

    r98103 r103977  
    111111    virtual bool isDone() const RT_OVERRIDE;
    112112    /** Returns object name. */
    113     virtual QString name() const /* override final */;
     113    virtual QString name() const RT_OVERRIDE RT_FINAL;
    114114    /** Returns object details. */
    115     virtual QString details() const /* override final */;
    116     /** Returns object internal name. */
    117     virtual QString internalName() const /* override final */;
    118     /** Returns object help keyword. */
    119     virtual QString helpKeyword() const /* override final */;
    120     /** Handles notification-object being added. */
    121     virtual void handle() /* override final */;
     115    virtual QString details() const RT_OVERRIDE RT_FINAL;
     116    /** Returns object internal name. */
     117    virtual QString internalName() const RT_OVERRIDE RT_FINAL;
     118    /** Returns object help keyword. */
     119    virtual QString helpKeyword() const RT_OVERRIDE RT_FINAL;
     120    /** Handles notification-object being added. */
     121    virtual void handle() RT_OVERRIDE RT_FINAL;
    122122
    123123    /** Returns whether message with passed @a strInternalName is suppressed. */
    … …  
    175175    virtual bool isDone() const RT_OVERRIDE;
    176176    /** Returns object internal name. */
    177     virtual QString internalName() const /* override final */;
    178     /** Returns object help keyword. */
    179     virtual QString helpKeyword() const /* override final */;
    180     /** Handles notification-object being added. */
    181     virtual void handle() /* override final */;
     177    virtual QString internalName() const RT_OVERRIDE RT_FINAL;
     178    /** Returns object help keyword. */
     179    virtual QString helpKeyword() const RT_OVERRIDE RT_FINAL;
     180    /** Handles notification-object being added. */
     181    virtual void handle() RT_OVERRIDE RT_FINAL;
    182182
    183183public slots:
    184184
    185185    /** Stops the progress and notifies model about closing. */
    186     virtual void close() /* override final */;
     186    virtual void close() RT_OVERRIDE RT_FINAL;
    187187
    188188private slots:
    … …  
    245245    virtual bool isDone() const RT_OVERRIDE;
    246246    /** Returns object internal name. */
    247     virtual QString internalName() const /* override final */;
    248     /** Returns object help keyword. */
    249     virtual QString helpKeyword() const /* override final */;
    250     /** Handles notification-object being added. */
    251     virtual void handle() /* override final */;
     247    virtual QString internalName() const RT_OVERRIDE RT_FINAL;
     248    /** Returns object help keyword. */
     249    virtual QString helpKeyword() const RT_OVERRIDE RT_FINAL;
     250    /** Handles notification-object being added. */
     251    virtual void handle() RT_OVERRIDE RT_FINAL;
    252252
    253253public slots:
    254254
    255255    /** Stops the downloader and notifies model about closing. */
    256     virtual void close() /* override final */;
     256    virtual void close() RT_OVERRIDE RT_FINAL;
    257257
    258258private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp

    r98103 r103977  
    6060
    6161    /** Handles translation event. */
    62     void retranslateUi();
     62    virtual void retranslateUi();
    6363
    6464    /** Updates toggle action states according to passed @a pActiveWindow. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h

    r103803 r103977  
    100100    /** @name Overridden functions of QMimeData.
    101101     * @{ */
    102     virtual QStringList formats(void) const;
     102    virtual QStringList formats(void) const RT_OVERRIDE;
    103103
    104     virtual bool hasFormat(const QString &mimeType) const;
     104    virtual bool hasFormat(const QString &mimeType) const RT_OVERRIDE;
    105105
    106106    virtual QVariant retrieveData(const QString &strMIMEType, QMetaType metaType) const RT_OVERRIDE;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

    r103538 r103977  
    171171    void FinalRelease();
    172172
    173     STDMETHOD(COMGETTER(Width))(ULONG *puWidth);
    174     STDMETHOD(COMGETTER(Height))(ULONG *puHeight);
    175     STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *puBitsPerPixel);
    176     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *puBytesPerLine);
    177     STDMETHOD(COMGETTER(PixelFormat))(BitmapFormat_T *puPixelFormat);
    178     STDMETHOD(COMGETTER(HeightReduction))(ULONG *puHeightReduction);
    179     STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **ppOverlay);
    180     STDMETHOD(COMGETTER(WinId))(LONG64 *pWinId);
    181     STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(FramebufferCapabilities_T, aCapabilities));
     173    STDMETHOD(COMGETTER(Width))(ULONG *puWidth) RT_OVERRIDE;
     174    STDMETHOD(COMGETTER(Height))(ULONG *puHeight) RT_OVERRIDE;
     175    STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *puBitsPerPixel) RT_OVERRIDE;
     176    STDMETHOD(COMGETTER(BytesPerLine))(ULONG *puBytesPerLine) RT_OVERRIDE;
     177    STDMETHOD(COMGETTER(PixelFormat))(BitmapFormat_T *puPixelFormat) RT_OVERRIDE;
     178    STDMETHOD(COMGETTER(HeightReduction))(ULONG *puHeightReduction) RT_OVERRIDE;
     179    STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **ppOverlay) RT_OVERRIDE;
     180    STDMETHOD(COMGETTER(WinId))(LONG64 *pWinId) RT_OVERRIDE;
     181    STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(FramebufferCapabilities_T, aCapabilities)) RT_OVERRIDE;
    182182
    183183    /** EMT callback: Notifies frame-buffer about guest-screen size change.
    … …  
    189189      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    190190      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    191     STDMETHOD(NotifyChange)(ULONG uScreenId, ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
     191    STDMETHOD(NotifyChange)(ULONG uScreenId, ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight) RT_OVERRIDE;
    192192
    193193    /** EMT callback: Notifies frame-buffer about guest-screen update.
    … …  
    198198      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    199199      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    200     STDMETHOD(NotifyUpdate)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
     200    STDMETHOD(NotifyUpdate)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight) RT_OVERRIDE;
    201201
    202202    /** EMT callback: Notifies frame-buffer about guest-screen update.
    … …  
    208208      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    209209      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    210     STDMETHOD(NotifyUpdateImage)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight, ComSafeArrayIn(BYTE, image));
     210    STDMETHOD(NotifyUpdateImage)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight, ComSafeArrayIn(BYTE, image)) RT_OVERRIDE;
    211211
    212212    /** EMT callback: Returns whether the frame-buffer implementation is willing to support a given video-mode.
    … …  
    217217      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    218218      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    219     STDMETHOD(VideoModeSupported)(ULONG uWidth, ULONG uHeight, ULONG uBPP, BOOL *pbSupported);
     219    STDMETHOD(VideoModeSupported)(ULONG uWidth, ULONG uHeight, ULONG uBPP, BOOL *pbSupported) RT_OVERRIDE;
    220220
    221221    /** EMT callback which is not used in current implementation. */
    222     STDMETHOD(GetVisibleRegion)(BYTE *pRectangles, ULONG uCount, ULONG *puCountCopied);
     222    STDMETHOD(GetVisibleRegion)(BYTE *pRectangles, ULONG uCount, ULONG *puCountCopied) RT_OVERRIDE;
    223223    /** EMT callback: Suggests new visible-region to this frame-buffer.
    224224      * @param        pRectangles Pointer to the RTRECT array.
    … …  
    226226      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    227227      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    228     STDMETHOD(SetVisibleRegion)(BYTE *pRectangles, ULONG uCount);
     228    STDMETHOD(SetVisibleRegion)(BYTE *pRectangles, ULONG uCount) RT_OVERRIDE;
    229229
    230230    /** EMT callback which is not used in current implementation. */
    231     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand, LONG enmCmd, BOOL fGuestCmd);
     231    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand, LONG enmCmd, BOOL fGuestCmd) RT_OVERRIDE;
    232232
    233233    /** EMT callback: Notifies frame-buffer about 3D backend event.
    … …  
    236236      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
    237237      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
    238     STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, data));
     238    STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, data)) RT_OVERRIDE;
    239239
    240240    /** Locks frame-buffer access. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

    r103085 r103977  
    686686
    687687    /** Handles state change. */
    688     void setState(int iState)
     688    void setState(int iState) RT_OVERRIDE
    689689    {
    690690        /* Update animation state: */
    … …  
    919919
    920920    /** Handles state change. */
    921     void setState(int iState)
     921    void setState(int iState) RT_OVERRIDE
    922922    {
    923923        if ((iState & UIMouseStateType_MouseAbsoluteDisabled) &&
    … …  
    10121012
    10131013    /** Retranslation routine. */
    1014     void retranslateUi()
     1014    virtual void retranslateUi() RT_OVERRIDE
    10151015    {
    10161016        sltUpdateAppearance();

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h

    r103803 r103977  
    111111
    112112    /** Context-menu event handler. */
    113     void contextMenuEvent(QContextMenuEvent *pEvent);
     113    void contextMenuEvent(QContextMenuEvent *pEvent) RT_OVERRIDE;
    114114
    115115    /** Returns position for passed @a indicatorType. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

    r103803 r103977  
    181181    void setMouseHandler(UIMouseHandler *pMouseHandler);
    182182    void addMachineWindow(UIMachineWindow *pMachineWindow);
    183     void retranslateUi();
     183    void retranslateUi() RT_OVERRIDE;
    184184#ifdef VBOX_WS_MAC
    185185    bool isDockIconPreviewEnabled() const { return m_fIsDockIconEnabled; }
    … …  
    222222
    223223    /* Handler: Event-filter stuff: */
    224     bool eventFilter(QObject *pWatched, QEvent *pEvent);
     224    bool eventFilter(QObject *pWatched, QEvent *pEvent) RT_OVERRIDE;
    225225
    226226private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

    r100064 r103977  
    135135
    136136    /* Translate stuff: */
    137     void retranslateUi();
     137    void retranslateUi() RT_OVERRIDE;
    138138
    139139    /** Handles any Qt @a pEvent. */
    … …  
    146146
    147147    /** Close event handler. */
    148     void closeEvent(QCloseEvent *pCloseEvent);
     148    void closeEvent(QCloseEvent *pCloseEvent) RT_OVERRIDE;
    149149
    150150#ifdef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

    r98675 r103977  
    8989
    9090    /** Accepts the dialog. */
    91     void accept();
     91    void accept() RT_OVERRIDE;
    9292
    9393private:

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h

    r98451 r103977  
    6666
    6767    /** Returns visual state type. */
    68     virtual UIVisualStateType visualStateType() const { return UIVisualStateType_Fullscreen; }
     68    virtual UIVisualStateType visualStateType() const RT_OVERRIDE { return UIVisualStateType_Fullscreen; }
    6969
    7070    /** Returns an index of host-screen for guest-screen with @a iScreenId specified. */
    … …  
    8181
    8282    /* Check if this logic is available: */
    83     bool checkAvailability();
     83    bool checkAvailability() RT_OVERRIDE;
    8484
    8585    /** Returns machine-window flags for 'Fullscreen' machine-logic and passed @a uScreenId. */
    86     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const;
     86    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const RT_OVERRIDE;
    8787
    8888    /** Adjusts machine-window geometry if necessary for 'Fullscreen'. */
    89     virtual void adjustMachineWindowsGeometry();
     89    virtual void adjustMachineWindowsGeometry() RT_OVERRIDE;
    9090
    9191private slots:
    … …  
    104104
    105105    /** Mac OS X: Requests visual-state change from 'fullscreen' to 'normal' (window). */
    106     void sltChangeVisualStateToNormal();
     106    void sltChangeVisualStateToNormal() RT_OVERRIDE;
    107107    /** Mac OS X: Requests visual-state change from 'fullscreen' to 'seamless'. */
    108     void sltChangeVisualStateToSeamless();
     108    void sltChangeVisualStateToSeamless() RT_OVERRIDE;
    109109    /** Mac OS X: Requests visual-state change from 'fullscreen' to 'scale'. */
    110     void sltChangeVisualStateToScale();
     110    void sltChangeVisualStateToScale() RT_OVERRIDE;
    111111
    112112    /** Mac OS X: Checks if some visual-state type was requested. */
    113     void sltCheckForRequestedVisualStateType();
     113    void sltCheckForRequestedVisualStateType() RT_OVERRIDE;
    114114#endif /* RT_OS_DARWIN */
    115115
    116116    /* Handler: Console callback stuff: */
    117     void sltMachineStateChanged();
     117    void sltMachineStateChanged() RT_OVERRIDE;
    118118
    119119    /** Invokes popup-menu. */
    … …  
    124124
    125125    /** Handles guest-screen count change. */
    126     virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
     126    virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo) RT_OVERRIDE;
    127127    /** Handles host-screen count change. */
    128     virtual void sltHostScreenCountChange();
     128    virtual void sltHostScreenCountChange() RT_OVERRIDE;
    129129    /** Handles host-screen available-area change. */
    130     virtual void sltHostScreenAvailableAreaChange();
     130    virtual void sltHostScreenAvailableAreaChange() RT_OVERRIDE;
    131131    /** Handles additions-state change. */
    132     virtual void sltAdditionsStateChanged();
     132    virtual void sltAdditionsStateChanged() RT_OVERRIDE;
    133133
    134134private:
    135135
    136136    /* Prepare helpers: */
    137     void prepareActionGroups();
    138     void prepareActionConnections();
    139     void prepareMachineWindows();
    140     void prepareMenu();
     137    void prepareActionGroups() RT_OVERRIDE;
     138    void prepareActionConnections() RT_OVERRIDE;
     139    void prepareMachineWindows() RT_OVERRIDE;
     140    void prepareMenu() RT_OVERRIDE;
    141141
    142142    /* Cleanup helpers: */
    143     void cleanupMenu();
    144     void cleanupMachineWindows();
    145     void cleanupActionConnections();
    146     void cleanupActionGroups();
     143    void cleanupMenu() RT_OVERRIDE;
     144    void cleanupMachineWindows() RT_OVERRIDE;
     145    void cleanupActionConnections() RT_OVERRIDE;
     146    void cleanupActionGroups() RT_OVERRIDE;
    147147
    148148#ifdef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

    r98103 r103977  
    5555
    5656    /* Event handlers: */
    57     bool eventFilter(QObject *pWatched, QEvent *pEvent);
     57    bool eventFilter(QObject *pWatched, QEvent *pEvent) RT_OVERRIDE;
    5858
    5959    /* Prepare routines: */
    60     void prepareCommon();
    61     void prepareFilters();
    62     void prepareConsoleConnections();
     60    void prepareCommon() RT_OVERRIDE;
     61    void prepareFilters() RT_OVERRIDE;
     62    void prepareConsoleConnections() RT_OVERRIDE;
    6363
    6464    /* Cleanup routines: */
    … …  
    7373
    7474    /** Adjusts guest-screen size to correspond current <i>working area</i> size. */
    75     void adjustGuestScreenSize();
     75    void adjustGuestScreenSize() RT_OVERRIDE;
    7676
    7777    /* Helpers: Geometry stuff: */
    78     QRect workingArea() const;
    79     QSize calculateMaxGuestSize() const;
     78    QRect workingArea() const RT_OVERRIDE;
     79    QSize calculateMaxGuestSize() const RT_OVERRIDE;
    8080
    8181    /* Private variables: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.h

    r103803 r103977  
    6262protected:
    6363
    64     void retranslateUi();
     64    virtual void retranslateUi() RT_OVERRIDE;
    6565
    6666private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

    r98451 r103977  
    4747
    4848    /** Returns visual state type. */
    49     virtual UIVisualStateType visualStateType() const { return UIVisualStateType_Normal; }
     49    virtual UIVisualStateType visualStateType() const RT_OVERRIDE { return UIVisualStateType_Normal; }
    5050
    5151protected:
    5252
    5353    /* Check if this logic is available: */
    54     bool checkAvailability();
     54    bool checkAvailability() RT_OVERRIDE;
    5555
    5656    /** Returns machine-window flags for 'Normal' machine-logic and passed @a uScreenId. */
    57     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::Window; }
     57    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const RT_OVERRIDE { Q_UNUSED(uScreenId); return Qt::Window; }
    5858
    5959private slots:
    6060
    6161    /** Checks if some visual-state type was requested. */
    62     void sltCheckForRequestedVisualStateType();
     62    void sltCheckForRequestedVisualStateType() RT_OVERRIDE;
    6363
    6464#ifndef RT_OS_DARWIN
    … …  
    9090    /* Prepare helpers: */
    9191    virtual void prepareActionGroups() RT_OVERRIDE;
    92     void prepareActionConnections();
    93     void prepareMachineWindows();
     92    void prepareActionConnections() RT_OVERRIDE;
     93    void prepareMachineWindows() RT_OVERRIDE;
    9494#ifndef VBOX_WS_MAC
    9595    void prepareMenu();
    … …  
    100100    void cleanupMenu();
    101101#endif /* !VBOX_WS_MAC */
    102     void cleanupMachineWindows();
    103     void cleanupActionConnections();
     102    void cleanupMachineWindows() RT_OVERRIDE;
     103    void cleanupActionConnections() RT_OVERRIDE;
    104104
    105105#ifndef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

    r98103 r103977  
    5555
    5656    /* Event handlers: */
    57     bool eventFilter(QObject *pWatched, QEvent *pEvent);
     57    bool eventFilter(QObject *pWatched, QEvent *pEvent) RT_OVERRIDE;
    5858
    5959    /* Prepare helpers: */
    60     void prepareCommon();
    61     void prepareFilters();
    62     void prepareConsoleConnections();
     60    void prepareCommon() RT_OVERRIDE;
     61    void prepareFilters() RT_OVERRIDE;
     62    void prepareConsoleConnections() RT_OVERRIDE;
    6363
    6464    /* Cleanup helpers: */
    … …  
    7373
    7474    /** Resends guest size-hint. */
    75     void resendSizeHint();
     75    void resendSizeHint() RT_OVERRIDE;
    7676
    7777    /** Adjusts guest-screen size to correspond current <i>machine-window</i> size. */
    78     void adjustGuestScreenSize();
     78    void adjustGuestScreenSize() RT_OVERRIDE;
    7979
    8080    /* Private helpers: */
    81     QSize sizeHint() const;
    82     QRect workingArea() const;
    83     QSize calculateMaxGuestSize() const;
     81    QSize sizeHint() const RT_OVERRIDE;
     82    QRect workingArea() const RT_OVERRIDE;
     83    QSize calculateMaxGuestSize() const RT_OVERRIDE;
    8484
    8585    /* Private members: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

    r99097 r103977  
    5858
    5959    /** Handles machine state change event. */
    60     void sltMachineStateChanged();
     60    void sltMachineStateChanged() RT_OVERRIDE;
    6161
    6262#ifndef RT_OS_DARWIN
    … …  
    8686#endif /* !VBOX_WS_MAC */
    8787    /** Prepare status-bar routine. */
    88     void prepareStatusBar();
     88    void prepareStatusBar() RT_OVERRIDE;
    8989    /** Prepare notification-center routine. */
    90     void prepareNotificationCenter();
     90    void prepareNotificationCenter() RT_OVERRIDE;
    9191    /** Prepare visual-state routine. */
    92     void prepareVisualState();
     92    void prepareVisualState() RT_OVERRIDE;
    9393    /** Load settings routine. */
    94     void loadSettings();
     94    void loadSettings() RT_OVERRIDE;
    9595
    9696    /** Cleanup visual-state routine. */
    97     void cleanupVisualState();
     97    void cleanupVisualState() RT_OVERRIDE;
    9898    /** Cleanup notification-center routine. */
    99     void cleanupNotificationCenter();
     99    void cleanupNotificationCenter() RT_OVERRIDE;
    100100    /** Cleanup status-bar routine. */
    101     void cleanupStatusBar();
     101    void cleanupStatusBar() RT_OVERRIDE;
    102102
    103103    /** Updates visibility according to visual-state. */
    104     void showInNecessaryMode();
     104    void showInNecessaryMode() RT_OVERRIDE;
    105105
    106106    /** Restores cached window geometry. */
    … …  
    113113
    114114    /** Common update routine. */
    115     void updateAppearanceOf(int aElement);
     115    void updateAppearanceOf(int aElement) RT_OVERRIDE;
    116116
    117117#ifndef VBOX_WS_MAC
    … …  
    121121
    122122    /** Common @a pEvent handler. */
    123     bool event(QEvent *pEvent);
     123    bool event(QEvent *pEvent) RT_OVERRIDE;
    124124
    125125    /** Returns whether this window is maximized. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.h

    r98451 r103977  
    4747
    4848    /** Returns visual state type. */
    49     virtual UIVisualStateType visualStateType() const { return UIVisualStateType_Scale; }
     49    virtual UIVisualStateType visualStateType() const RT_OVERRIDE { return UIVisualStateType_Scale; }
    5050
    5151protected:
    5252
    5353    /* Check if this logic is available: */
    54     bool checkAvailability();
     54    bool checkAvailability() RT_OVERRIDE;
    5555
    5656    /** Returns machine-window flags for 'Scale' machine-logic and passed @a uScreenId. */
    57     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::Window; }
     57    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const RT_OVERRIDE { Q_UNUSED(uScreenId); return Qt::Window; }
    5858
    5959private slots:
    … …  
    7070
    7171    /* Prepare helpers: */
    72     void prepareActionGroups();
    73     void prepareActionConnections();
    74     void prepareMachineWindows();
     72    void prepareActionGroups() RT_OVERRIDE;
     73    void prepareActionConnections() RT_OVERRIDE;
     74    void prepareMachineWindows() RT_OVERRIDE;
    7575#ifndef RT_OS_DARWIN
    7676    void prepareMenu();
    … …  
    8181    void cleanupMenu();
    8282#endif /* !RT_OS_DARWIN */
    83     void cleanupMachineWindows();
    84     void cleanupActionConnections();
    85     void cleanupActionGroups();
     83    void cleanupMachineWindows() RT_OVERRIDE;
     84    void cleanupActionConnections() RT_OVERRIDE;
     85    void cleanupActionGroups() RT_OVERRIDE;
    8686
    8787#ifndef RT_OS_DARWIN

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h

    r98103 r103977  
    4848
    4949    /** Prepare main-layout routine. */
    50     void prepareMainLayout();
     50    void prepareMainLayout() RT_OVERRIDE;
    5151    /** Prepare notification-center routine. */
    52     void prepareNotificationCenter();
     52    void prepareNotificationCenter() RT_OVERRIDE;
    5353#ifdef VBOX_WS_MAC
    5454    /** Prepare visual-state routine. */
    55     void prepareVisualState();
     55    void prepareVisualState() RT_OVERRIDE;
    5656#endif /* VBOX_WS_MAC */
    5757    /** Load settings routine. */
    58     void loadSettings();
     58    void loadSettings() RT_OVERRIDE;
    5959
    6060#ifdef VBOX_WS_MAC
    6161    /** Cleanup visual-state routine. */
    62     void cleanupVisualState();
     62    void cleanupVisualState() RT_OVERRIDE;
    6363#endif /* VBOX_WS_MAC */
    6464    /** Cleanup notification-center routine. */
    65     void cleanupNotificationCenter();
     65    void cleanupNotificationCenter() RT_OVERRIDE;
    6666
    6767    /** Updates visibility according to visual-state. */
    68     void showInNecessaryMode();
     68    void showInNecessaryMode() RT_OVERRIDE;
    6969
    7070    /** Restores cached window geometry. */
    … …  
    7777
    7878    /** Common @a pEvent handler. */
    79     bool event(QEvent *pEvent);
     79    bool event(QEvent *pEvent) RT_OVERRIDE;
    8080
    8181    /** Returns whether this window is maximized. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h

    r98451 r103977  
    5252
    5353    /** Returns visual state type. */
    54     virtual UIVisualStateType visualStateType() const { return UIVisualStateType_Seamless; }
     54    virtual UIVisualStateType visualStateType() const RT_OVERRIDE { return UIVisualStateType_Seamless; }
    5555
    5656    /** Returns an index of host-screen for guest-screen with @a iScreenId specified. */
    … …  
    6262
    6363    /* Check if this logic is available: */
    64     bool checkAvailability();
     64    bool checkAvailability() RT_OVERRIDE;
    6565
    6666    /** Returns machine-window flags for 'Seamless' machine-logic and passed @a uScreenId. */
    67     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::FramelessWindowHint; }
     67    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const RT_OVERRIDE { Q_UNUSED(uScreenId); return Qt::FramelessWindowHint; }
    6868
    6969    /** Adjusts machine-window geometry if necessary for 'Seamless'. */
    70     virtual void adjustMachineWindowsGeometry();
     70    virtual void adjustMachineWindowsGeometry() RT_OVERRIDE;
    7171
    7272private slots:
    7373
    7474    /** Checks if some visual-state type was requested. */
    75     void sltCheckForRequestedVisualStateType();
     75    void sltCheckForRequestedVisualStateType() RT_OVERRIDE;
    7676
    7777    /* Handler: Console callback stuff: */
    78     void sltMachineStateChanged();
     78    void sltMachineStateChanged() RT_OVERRIDE;
    7979
    8080    /** Updates machine-window(s) location/size on screen-layout changes. */
    … …  
    8282
    8383    /** Handles guest-screen count change. */
    84     virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
     84    virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo) RT_OVERRIDE;
    8585    /** Handles host-screen count change. */
    86     virtual void sltHostScreenCountChange();
     86    virtual void sltHostScreenCountChange() RT_OVERRIDE;
    8787    /** Handles additions-state change. */
    88     virtual void sltAdditionsStateChanged();
     88    virtual void sltAdditionsStateChanged() RT_OVERRIDE;
    8989
    9090#ifndef RT_OS_DARWIN
    … …  
    9696
    9797    /* Prepare helpers: */
    98     void prepareActionGroups();
    99     void prepareActionConnections();
    100     void prepareMachineWindows();
     98    void prepareActionGroups() RT_OVERRIDE;
     99    void prepareActionConnections() RT_OVERRIDE;
     100    void prepareMachineWindows() RT_OVERRIDE;
    101101#ifndef VBOX_WS_MAC
    102102    void prepareMenu();
    … …  
    107107    void cleanupMenu();
    108108#endif /* !VBOX_WS_MAC */
    109     void cleanupMachineWindows();
    110     void cleanupActionConnections();
    111     void cleanupActionGroups();
     109    void cleanupMachineWindows() RT_OVERRIDE;
     110    void cleanupActionConnections() RT_OVERRIDE;
     111    void cleanupActionGroups() RT_OVERRIDE;
    112112
    113113    /* Variables: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.h

    r98103 r103977  
    138138
    139139    /** Worker-thread serialization rutine. */
    140     void run();
     140    void run() RT_OVERRIDE;
    141141
    142142    /** Holds the load/save direction. */
    … …  
    182182
    183183    /** Executes the dialog. */
    184     int exec();
     184    int exec() RT_OVERRIDE;
    185185
    186186    /** Returns the instance of wrapper(s) to load/save the data from/to. */
    … …  
    196196
    197197    /** Translate routine: */
    198     void retranslateUi();
     198    virtual void retranslateUi() RT_OVERRIDE;
    199199
    200200    /** Close event-handler called with the given window system @a pEvent. */
    201     virtual void closeEvent(QCloseEvent *pEvent);
     201    virtual void closeEvent(QCloseEvent *pEvent) RT_OVERRIDE;
    202202
    203203private slots:
    204204
    205205    /** Hides the modal dialog and sets the result code to <i>Rejected</i>. */
    206     virtual void reject();
     206    virtual void reject() RT_OVERRIDE;
    207207
    208208    /** Starts the process. */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp

    r103803 r103977  
    6161
    6262    /** Performs item translation. */
    63     void retranslateUi();
     63    virtual void retranslateUi();
    6464
    6565private:
    … …  
    100100
    101101    /** Return size hint. */
    102     virtual QSize sizeHint() const;
     102    virtual QSize sizeHint() const RT_OVERRIDE;
    103103    /** Return minimum size hint. */
    104     virtual QSize minimumSizeHint() const;
     104    virtual QSize minimumSizeHint() const RT_OVERRIDE;
    105105
    106106    /** Handles translation event. */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.cpp

    r103362 r103977  
    7272
    7373    /** Returns whether this item is less than the @a other one. */
    74     bool operator<(const QTreeWidgetItem &other) const;
     74    bool operator<(const QTreeWidgetItem &other) const RT_OVERRIDE;
    7575
    7676    /** Returns child item number @a iIndex. */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStatusBarEditor.cpp

    r101562 r103977  
    8484
    8585    /** Returns button size-hint. */
    86     QSize sizeHint() const { return m_size; }
     86    QSize sizeHint() const RT_OVERRIDE { return m_size; }
    8787
    8888    /** Returns whether button is checked. */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

    r103771 r103977  
    238238
    239239    /** Returns child item with specified @a iIndex. */
    240     virtual AbstractItem *childItem(int iIndex) const = 0;
     240    virtual AbstractItem *childItem(int iIndex) const RT_OVERRIDE = 0;
    241241    /** Returns child item with specified @a uId. */
    242242    virtual AbstractItem *childItemById(const QUuid &uId) const = 0;
    … …  
    743743
    744744    /** Returns model flags for @a specifiedIndex. */
    745     Qt::ItemFlags flags(const QModelIndex &specifiedIndex) const;
     745    Qt::ItemFlags flags(const QModelIndex &specifiedIndex) const RT_OVERRIDE;
    746746
    747747    /** Holds the parent editor this model belongs to. */

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

    r98103 r103977  
    5656
    5757    /* Handlers: Dialog stuff: */
    58     void accept();
    59     void reject();
     58    void accept() RT_OVERRIDE;
     59    void reject() RT_OVERRIDE;
    6060
    6161private:
    6262
    6363    /* Handler: Translation stuff: */
    64     void retranslateUi();
     64    virtual void retranslateUi() RT_OVERRIDE;
    6565
    6666    /* Widgets: */

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

    r103795 r103977  
    142142
    143143    /** Returns the minimum size-hint. */
    144     QSize minimumSizeHint() const;
     144    QSize minimumSizeHint() const RT_OVERRIDE;
    145145
    146146protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.h

    r98103 r103977  
    8181      * If all passwords are valid,
    8282      * this slot calls to base-class. */
    83     void accept();
     83    void accept() RT_OVERRIDE;
    8484
    8585private:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.h

    r98103 r103977  
    108108
    109109protected:
    110     void retranslateUi();
     110    virtual void retranslateUi() RT_OVERRIDE;
    111111
    112112private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

    r98103 r103977  
    148148
    149149    /** Preprocesses every @a pEvent sent to @a pObject. */
    150     bool eventFilter(QObject *pObject, QEvent *pEvent);
     150    bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
    151151
    152152    /** Handles resize @a pEvent. */
    153     void resizeEvent(QResizeEvent *pEvent);
     153    void resizeEvent(QResizeEvent *pEvent) RT_OVERRIDE;
    154154
    155155    /** Handles focus-in @a pEvent. */
    156     void focusInEvent(QFocusEvent *pEvent);
     156    void focusInEvent(QFocusEvent *pEvent) RT_OVERRIDE;
    157157    /** Handles focus-out @a pEvent. */
    158     void focusOutEvent(QFocusEvent *pEvent);
     158    void focusOutEvent(QFocusEvent *pEvent) RT_OVERRIDE;
    159159
    160160    /** Handles translation event. */
    161     void retranslateUi();
     161    virtual void retranslateUi() RT_OVERRIDE;
    162162
    163163private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.h

    r98103 r103977  
    5757
    5858protected:
    59     void retranslateUi();
     59    virtual void retranslateUi() RT_OVERRIDE;
    6060
    6161private slots:
    62     void open();
     62    void open() RT_OVERRIDE;
    6363
    6464private:
    … …  
    8888
    8989protected:
    90     void retranslateUi();
     90    virtual void retranslateUi() RT_OVERRIDE;
    9191
    9292private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.h

    r98103 r103977  
    117117
    118118    /** Returns minimum size-hint. */
    119     QSize minimumSizeHint() const { return m_minimumSizeHint; }
     119    QSize minimumSizeHint() const RT_OVERRIDE { return m_minimumSizeHint; }
    120120    /** Defines @a minimumSizeHint. */
    121121    void setMinimumSizeHint(const QSize &minimumSizeHint);

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingWidget.h

    r103704 r103977  
    7777
    7878    /** Holds the minimum widget size. */
    79     virtual QSize minimumSizeHint() const /* pverride */;
     79    virtual QSize minimumSizeHint() const RT_OVERRIDE;
    8080
    8181    /** Defines @a pWidget1 and @a pWidget2. */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h

    r98103 r103977  
    147147
    148148    /** Returns size-hint. */
    149     QSize sizeHint() const;
     149    QSize sizeHint() const RT_OVERRIDE;
    150150# endif /* VBOX_WS_MAC */
    151151
    … …  
    156156
    157157    /** Handles translation event. */
    158     void retranslateUi();
     158    virtual void retranslateUi() RT_OVERRIDE;
    159159
    160160# ifdef VBOX_WS_MAC
    161161    /** Handles button hit as certain @a position. */
    162     bool hitButton(const QPoint &position) const;
     162    bool hitButton(const QPoint &position) const RT_OVERRIDE;
    163163
    164164    /** Handles paint @a pEvent. */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

    r103710 r103977  
    101101
    102102    virtual bool eventFilter(QObject *pWatched, QEvent *pEvent) RT_OVERRIDE;
    103     virtual void retranslateUi() /* override final */;
     103    virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    104104
    105105private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.h

    r98103 r103977  
    6666protected:
    6767
    68     virtual void retranslateUi() /* override final */;
     68    virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    6969
    7070private slots:

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

    r103961 r103977  
    117117    /** Executes wizard in window modal mode.
    118118      * @note You shouldn't have to override it! */
    119     virtual int exec() /* final */;
     119    virtual int exec() RT_OVERRIDE RT_FINAL;
    120120    /** Shows wizard in non-mode.
    121121      * @note You shouldn't have to override it! */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h

    r103957 r103977  
    5656
    5757    /** Performs page initialization. */
    58     virtual void initializePage() /* override final */;
     58    virtual void initializePage() RT_OVERRIDE RT_FINAL;
    5959
    6060    /** Returns whether page is complete. */
    61     virtual bool isComplete() const /* override final */;
     61    virtual bool isComplete() const RT_OVERRIDE RT_FINAL;
    6262
    6363    /** Performs page validation. */
    64     virtual bool validatePage() /* override final */;
     64    virtual bool validatePage() RT_OVERRIDE RT_FINAL;
    6565
    6666private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageSource.h

    r103957 r103977  
    9797
    9898    /** Performs page initialization. */
    99     virtual void initializePage() /* override final */;
     99    virtual void initializePage() RT_OVERRIDE RT_FINAL;
    100100
    101101    /** Returns whether page is complete. */
    102     virtual bool isComplete() const /* override final */;
     102    virtual bool isComplete() const RT_OVERRIDE RT_FINAL;
    103103
    104104    /** Performs page validation. */
    105     virtual bool validatePage() /* override final */;
     105    virtual bool validatePage() RT_OVERRIDE RT_FINAL;
    106106
    107107private slots:

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

    r103957 r103977  
    6767
    6868    /** Prepare stuff. */
    69     void initializePage();
     69    void initializePage() RT_OVERRIDE;
    7070    void prepare(const QString &strOriginalName, const QString &strDefaultPath, bool fShowChildsOption);
    7171
    7272    /** Validation stuff. */
    73     bool isComplete() const;
    74     bool validatePage();
     73    bool isComplete() const RT_OVERRIDE;
     74    bool validatePage() RT_OVERRIDE;
    7575    void setCloneModeGroupBoxEnabled();
    7676

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

    r103957 r103977  
    6464
    6565    /** Prepare stuff. */
    66     void initializePage();
     66    void initializePage() RT_OVERRIDE;
    6767    void prepare();
    6868
    6969    /** Validation stuff. */
    70     bool validatePage();
     70    bool validatePage() RT_OVERRIDE;
    7171
    7272    /** Widgets. */

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

    r103957 r103977  
    6868private:
    6969
    70     void initializePage();
     70    void initializePage() RT_OVERRIDE;
    7171    void prepare(const QString &strDefaultClonePath);
    7272    /** Validation stuff */
    73     bool isComplete() const;
     73    bool isComplete() const RT_OVERRIDE;
    7474
    7575    QIRichTextLabel *m_pMainLabel;

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

    r103957 r103977  
    5757private:
    5858
    59     void initializePage();
     59    void initializePage() RT_OVERRIDE;
    6060    void prepare();
    61     bool validatePage();
     61    bool validatePage() RT_OVERRIDE;
    6262
    6363    QIRichTextLabel *m_pLabel;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h

    r103957 r103977  
    116116
    117117    /** Performs page initialization. */
    118     virtual void initializePage() /* override final */;
     118    virtual void initializePage() RT_OVERRIDE RT_FINAL;
    119119
    120120    /** Returns whether page is complete. */
    121     virtual bool isComplete() const /* override final */;
     121    virtual bool isComplete() const RT_OVERRIDE RT_FINAL;
    122122
    123123    /** Performs page validation. */
    124     virtual bool validatePage() /* override final */;
     124    virtual bool validatePage() RT_OVERRIDE RT_FINAL;
    125125
    126126private slots:

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

    r103957 r103977  
    109109    /** Prepare stuff. */
    110110    void createConnections();
    111     void initializePage();
     111    void initializePage() RT_OVERRIDE;
    112112    void initializeWidgets();
    113113    /** Set the values of the widget if they depend on OS
    … …  
    118118
    119119    /** Validation stuff. */
    120     bool isComplete() const;
    121     bool validatePage();
     120    bool isComplete() const RT_OVERRIDE;
     121    bool validatePage() RT_OVERRIDE;
    122122
    123123    bool isProductKeyWidgetEnabled() const;

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

    r103957 r103977  
    9191    void prepare();
    9292    void createConnections();
    93     void initializePage();
     93    void initializePage() RT_OVERRIDE;
    9494    QWidget *createNameOSTypeWidgets();
    9595    void markWidgets() const;

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

    r103957 r103977  
    7272    void prepare();
    7373    void createConnections();
    74     void initializePage();
    75     bool isComplete() const;
     74    void initializePage() RT_OVERRIDE;
     75    bool isComplete() const RT_OVERRIDE;
    7676    /** Returns true if we show the widgets for guest os product key. */
    7777    bool isProductKeyWidgetEnabled() const;

  • trunk/src/VBox/Main/idl/apiwrap-server.xsl

    r98262 r103977  
    11221122        <xsl:with-param name="dir">out</xsl:with-param>
    11231123    </xsl:call-template>
    1124     <xsl:text>);
     1124    <xsl:text>) RT_OVERRIDE;
    11251125</xsl:text>
    11261126
    … …  
    11301130            <xsl:with-param name="dir">in</xsl:with-param>
    11311131        </xsl:call-template>
    1132         <xsl:text>);
     1132        <xsl:text>) RT_OVERRIDE;
    11331133</xsl:text>
    11341134    </xsl:if>
    … …  
    15981598                    <xsl:text>    STDMETHOD(COMGETTER(InternalAndReservedAttribute</xsl:text>
    15991599                    <xsl:value-of select="concat(position(), $name)"/>
    1600                     <xsl:text>))(ULONG *aReserved);&#x0A;</xsl:text>
     1600                    <xsl:text>))(ULONG *aReserved) RT_OVERRIDE;&#x0A;</xsl:text>
    16011601                </xsl:for-each>
    16021602            </xsl:if>
    … …  
    17111711        </xsl:if>
    17121712    </xsl:for-each>
    1713     <xsl:text>);
     1713    <xsl:text>) RT_OVERRIDE;
    17141714</xsl:text>
    17151715
    … …  
    22412241                    <xsl:text>    STDMETHOD(InternalAndReservedMethod</xsl:text>
    22422242                    <xsl:value-of select="concat(position(), $name)"/>
    2243                     <xsl:text>)();&#x0A;</xsl:text>
     2243                    <xsl:text>)() RT_OVERRIDE;&#x0A;</xsl:text>
    22442244                </xsl:for-each>
    22452245            </xsl:if>

  • trunk/src/VBox/Main/idl/comimpl.xsl

    r98108 r103977  
    800800        return mEvent->WaitProcessed(aTimeout, aResult);
    801801    }
    802     void uninit()
     802    void uninit() RT_OVERRIDE
    803803    {
    804804        if (!mEvent.isNull())

  • trunk/src/VBox/Main/include/CPUProfileImpl.h

    r98103 r103977  
    4949    void    FinalRelease();
    5050    HRESULT initFromDbEntry(struct CPUMDBENTRY const *a_pDbEntry) RT_NOEXCEPT;
    51     void    uninit();
     51    void    uninit() RT_OVERRIDE;
    5252    /** @} */
    5353

  • trunk/src/VBox/Main/include/DHCPConfigImpl.h

    r98103 r103977  
    157157    HRESULT initWithDefaults(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent);
    158158    HRESULT initWithSettings(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const settings::DHCPConfig &rConfig);
    159     void    uninit();
     159    void    uninit() RT_OVERRIDE;
    160160    /** @} */
    161161
    … …  
    258258                             const com::Utf8Str a_strValue);
    259259    HRESULT initWithSettings(DHCPGroupConfig *a_pParent, const settings::DHCPGroupCondition &a_rSrc);
    260     void    uninit();
     260    void    uninit() RT_OVERRIDE;
    261261    /** @} */
    262262
    … …  
    322322    HRESULT initWithDefaults(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const com::Utf8Str &a_rName);
    323323    HRESULT initWithSettings(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const settings::DHCPGroupConfig &a_rSrc);
    324     void    uninit();
     324    void    uninit() RT_OVERRIDE;
    325325    /** @} */
    326326
    … …  
    446446    HRESULT initWithSettingsAndMACAddress(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent,
    447447                                          const settings::DHCPIndividualConfig &rData, PCRTMAC a_pMACAddress);
    448     void    uninit();
     448    void    uninit() RT_OVERRIDE;
    449449    /** @} */
    450450

  • trunk/src/VBox/Main/include/DHCPServerImpl.h

    r98103 r103977  
    7373    HRESULT init(VirtualBox *aVirtualBox, const com::Utf8Str &aName);
    7474    HRESULT init(VirtualBox *aVirtualBox, const settings::DHCPServer &data);
    75     void    uninit();
     75    void    uninit() RT_OVERRIDE;
    7676    /** @} */
    7777
    … …  
    9797    HRESULT getGlobalConfig(ComPtr<IDHCPGlobalConfig> &aGlobalConfig) RT_OVERRIDE;
    9898    HRESULT getGroupConfigs(std::vector<ComPtr<IDHCPGroupConfig> > &aGroupConfigs) RT_OVERRIDE;
    99     HRESULT getIndividualConfigs(std::vector<ComPtr<IDHCPIndividualConfig> > &aIndividualConfigs) ;
     99    HRESULT getIndividualConfigs(std::vector<ComPtr<IDHCPIndividualConfig> > &aIndividualConfigs) RT_OVERRIDE;
    100100    /** @} */
    101101

  • trunk/src/VBox/Main/include/HostDriveImpl.h

    r98103 r103977  
    4646     * @{ */
    4747    HRESULT initFromPathAndModel(const com::Utf8Str &drivePath, const com::Utf8Str &driveModel);
    48     void uninit();
     48    void uninit() RT_OVERRIDE;
    4949    /** @} */
    5050

  • trunk/src/VBox/Main/include/HostDrivePartitionImpl.h

    r98103 r103977  
    4848     * @{ */
    4949    HRESULT initFromDvmVol(RTDVMVOLUME hVol);
    50     void uninit();
     50    void uninit() RT_OVERRIDE;
    5151    /** @} */
    5252

  • trunk/src/VBox/Main/include/MachineDebuggerImpl.h

    r98103 r103977  
    5252    // public initializer/uninitializer for internal purposes only
    5353    HRESULT init (Console *aParent);
    54     void uninit();
     54    void uninit() RT_OVERRIDE;
    5555
    5656    // "public-private methods"
    … …  
    6060
    6161    // wrapped IMachineDeugger properties
    62     HRESULT getSingleStep(BOOL *aSingleStep);
    63     HRESULT setSingleStep(BOOL aSingleStep);
    64     HRESULT getExecuteAllInIEM(BOOL *aExecuteAllInIEM);
    65     HRESULT setExecuteAllInIEM(BOOL aExecuteAllInIEM);
    66     HRESULT getLogEnabled(BOOL *aLogEnabled);
    67     HRESULT setLogEnabled(BOOL aLogEnabled);
    68     HRESULT getLogDbgFlags(com::Utf8Str &aLogDbgFlags);
    69     HRESULT getLogDbgGroups(com::Utf8Str &aLogDbgGroups);
    70     HRESULT getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations);
    71     HRESULT getLogRelFlags(com::Utf8Str &aLogRelFlags);
    72     HRESULT getLogRelGroups(com::Utf8Str &aLogRelGroups);
    73     HRESULT getLogRelDestinations(com::Utf8Str &aLogRelDestinations);
    74     HRESULT getExecutionEngine(VMExecutionEngine_T *apenmEngine);
    75     HRESULT getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled);
    76     HRESULT getHWVirtExVPIDEnabled(BOOL *aHWVirtExVPIDEnabled);
    77     HRESULT getHWVirtExUXEnabled(BOOL *aHWVirtExUXEnabled);
    78     HRESULT getOSName(com::Utf8Str &aOSName);
    79     HRESULT getOSVersion(com::Utf8Str &aOSVersion);
    80     HRESULT getPAEEnabled(BOOL *aPAEEnabled);
    81     HRESULT getVirtualTimeRate(ULONG *aVirtualTimeRate);
    82     HRESULT setVirtualTimeRate(ULONG aVirtualTimeRate);
    83     HRESULT getUptime(LONG64 *aUptime);
     62    HRESULT getSingleStep(BOOL *aSingleStep) RT_OVERRIDE;
     63    HRESULT setSingleStep(BOOL aSingleStep) RT_OVERRIDE;
     64    HRESULT getExecuteAllInIEM(BOOL *aExecuteAllInIEM) RT_OVERRIDE;
     65    HRESULT setExecuteAllInIEM(BOOL aExecuteAllInIEM) RT_OVERRIDE;
     66    HRESULT getLogEnabled(BOOL *aLogEnabled) RT_OVERRIDE;
     67    HRESULT setLogEnabled(BOOL aLogEnabled) RT_OVERRIDE;
     68    HRESULT getLogDbgFlags(com::Utf8Str &aLogDbgFlags) RT_OVERRIDE;
     69    HRESULT getLogDbgGroups(com::Utf8Str &aLogDbgGroups) RT_OVERRIDE;
     70    HRESULT getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations) RT_OVERRIDE;
     71    HRESULT getLogRelFlags(com::Utf8Str &aLogRelFlags) RT_OVERRIDE;
     72    HRESULT getLogRelGroups(com::Utf8Str &aLogRelGroups) RT_OVERRIDE;
     73    HRESULT getLogRelDestinations(com::Utf8Str &aLogRelDestinations) RT_OVERRIDE;
     74    HRESULT getExecutionEngine(VMExecutionEngine_T *apenmEngine) RT_OVERRIDE;
     75    HRESULT getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled) RT_OVERRIDE;
     76    HRESULT getHWVirtExVPIDEnabled(BOOL *aHWVirtExVPIDEnabled) RT_OVERRIDE;
     77    HRESULT getHWVirtExUXEnabled(BOOL *aHWVirtExUXEnabled) RT_OVERRIDE;
     78    HRESULT getOSName(com::Utf8Str &aOSName) RT_OVERRIDE;
     79    HRESULT getOSVersion(com::Utf8Str &aOSVersion) RT_OVERRIDE;
     80    HRESULT getPAEEnabled(BOOL *aPAEEnabled) RT_OVERRIDE;
     81    HRESULT getVirtualTimeRate(ULONG *aVirtualTimeRate) RT_OVERRIDE;
     82    HRESULT setVirtualTimeRate(ULONG aVirtualTimeRate) RT_OVERRIDE;
     83    HRESULT getUptime(LONG64 *aUptime) RT_OVERRIDE;
    8484
    8585    // wrapped IMachineDeugger methods
    8686    HRESULT dumpGuestCore(const com::Utf8Str &aFilename,
    87                           const com::Utf8Str &aCompression);
     87                          const com::Utf8Str &aCompression) RT_OVERRIDE;
    8888    HRESULT dumpHostProcessCore(const com::Utf8Str &aFilename,
    89                                 const com::Utf8Str &aCompression);
     89                                const com::Utf8Str &aCompression) RT_OVERRIDE;
    9090    HRESULT info(const com::Utf8Str &aName,
    9191                 const com::Utf8Str &aArgs,
    92                  com::Utf8Str &aInfo);
    93     HRESULT injectNMI();
    94     HRESULT modifyLogGroups(const com::Utf8Str &aSettings);
    95     HRESULT modifyLogFlags(const com::Utf8Str &aSettings);
    96     HRESULT modifyLogDestinations(const com::Utf8Str &aSettings);
     92                 com::Utf8Str &aInfo) RT_OVERRIDE;
     93    HRESULT injectNMI() RT_OVERRIDE;
     94    HRESULT modifyLogGroups(const com::Utf8Str &aSettings) RT_OVERRIDE;
     95    HRESULT modifyLogFlags(const com::Utf8Str &aSettings) RT_OVERRIDE;
     96    HRESULT modifyLogDestinations(const com::Utf8Str &aSettings) RT_OVERRIDE;
    9797    HRESULT readPhysicalMemory(LONG64 aAddress,
    9898                               ULONG aSize,
    99                                std::vector<BYTE> &aBytes);
     99                               std::vector<BYTE> &aBytes) RT_OVERRIDE;
    100100    HRESULT writePhysicalMemory(LONG64 aAddress,
    101101                                ULONG aSize,
    102                                 const std::vector<BYTE> &aBytes);
     102                                const std::vector<BYTE> &aBytes) RT_OVERRIDE;
    103103    HRESULT readVirtualMemory(ULONG aCpuId,
    104104                              LONG64 aAddress,
    105105                              ULONG aSize,
    106                               std::vector<BYTE> &aBytes);
     106                              std::vector<BYTE> &aBytes) RT_OVERRIDE;
    107107    HRESULT writeVirtualMemory(ULONG aCpuId,
    108108                               LONG64 aAddress,
    109109                               ULONG aSize,
    110                                const std::vector<BYTE> &aBytes);
     110                               const std::vector<BYTE> &aBytes) RT_OVERRIDE;
    111111    HRESULT loadPlugIn(const com::Utf8Str &aName,
    112                        com::Utf8Str &aPlugInName);
    113     HRESULT unloadPlugIn(const com::Utf8Str &aName);
    114     HRESULT detectOS(com::Utf8Str &aOs);
     112                       com::Utf8Str &aPlugInName) RT_OVERRIDE;
     113    HRESULT unloadPlugIn(const com::Utf8Str &aName) RT_OVERRIDE;
     114    HRESULT detectOS(com::Utf8Str &aOs) RT_OVERRIDE;
    115115    HRESULT queryOSKernelLog(ULONG aMaxMessages,
    116                              com::Utf8Str &aDmesg);
     116                             com::Utf8Str &aDmesg) RT_OVERRIDE;
    117117    HRESULT getRegister(ULONG aCpuId,
    118118                        const com::Utf8Str &aName,
    119                         com::Utf8Str &aValue);
     119                        com::Utf8Str &aValue) RT_OVERRIDE;
    120120    HRESULT getRegisters(ULONG aCpuId,
    121121                         std::vector<com::Utf8Str> &aNames,
    122                          std::vector<com::Utf8Str> &aValues);
     122                         std::vector<com::Utf8Str> &aValues) RT_OVERRIDE;
    123123    HRESULT setRegister(ULONG aCpuId,
    124124                        const com::Utf8Str &aName,
    125                         const com::Utf8Str &aValue);
     125                        const com::Utf8Str &aValue) RT_OVERRIDE;
    126126    HRESULT setRegisters(ULONG aCpuId,
    127127                         const std::vector<com::Utf8Str> &aNames,
    128                          const std::vector<com::Utf8Str> &aValues);
     128                         const std::vector<com::Utf8Str> &aValues) RT_OVERRIDE;
    129129    HRESULT dumpGuestStack(ULONG aCpuId,
    130                            com::Utf8Str &aStack);
    131     HRESULT resetStats(const com::Utf8Str &aPattern);
    132     HRESULT dumpStats(const com::Utf8Str &aPattern);
     130                           com::Utf8Str &aStack) RT_OVERRIDE;
     131    HRESULT resetStats(const com::Utf8Str &aPattern) RT_OVERRIDE;
     132    HRESULT dumpStats(const com::Utf8Str &aPattern) RT_OVERRIDE;
    133133    HRESULT getStats(const com::Utf8Str &aPattern,
    134134                     BOOL aWithDescriptions,
    135                      com::Utf8Str &aStats);
     135                     com::Utf8Str &aStats) RT_OVERRIDE;
    136136    HRESULT getCPULoad(ULONG aCpuId, ULONG *aPctExecuting, ULONG *aPctHalted, ULONG *aPctOther, LONG64 *aMsInterval) RT_OVERRIDE;
    137     HRESULT takeGuestSample(const com::Utf8Str &aFilename, ULONG aUsInterval, LONG64 aUsSampleTime, ComPtr<IProgress> &pProgress);
    138     HRESULT getUVMAndVMMFunctionTable(LONG64 aMagicVersion, LONG64 *aVMMFunctionTable, LONG64 *aUVM);
     137    HRESULT takeGuestSample(const com::Utf8Str &aFilename, ULONG aUsInterval, LONG64 aUsSampleTime, ComPtr<IProgress> &pProgress) RT_OVERRIDE;
     138    HRESULT getUVMAndVMMFunctionTable(LONG64 aMagicVersion, LONG64 *aVMMFunctionTable, LONG64 *aUVM) RT_OVERRIDE;
    139139
    140140    // private methods

  • trunk/src/VBox/Main/include/MachineImpl.h

    r103085 r103977  
    13531353    // public initializer/uninitializer for internal purposes only
    13541354    HRESULT init(Machine *aMachine);
    1355     void uninit() { uninit(Uninit::Unexpected); }
     1355    void uninit() RT_OVERRIDE { uninit(Uninit::Unexpected); }
    13561356    void uninit(Uninit::Reason aReason);
    13571357
    13581358
    13591359    // util::Lockable interface
    1360     RWLockHandle *lockHandle() const;
     1360    RWLockHandle *lockHandle() const RT_OVERRIDE;
    13611361
    13621362    // public methods only for internal purposes
    13631363
    1364     virtual bool i_isSessionMachine() const
     1364    virtual bool i_isSessionMachine() const RT_OVERRIDE
    13651365    {
    13661366        return true;
    … …  
    13781378    ClientToken *i_getClientToken();
    13791379
    1380     HRESULT i_onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter);
     1380    HRESULT i_onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter) RT_OVERRIDE;
    13811381    HRESULT i_onNATRedirectRuleChanged(ULONG ulSlot, BOOL aNatRuleRemove, const Utf8Str &aRuleName,
    13821382                                       NATProtocol_T aProto, const Utf8Str &aHostIp, LONG aHostPort,
    13831383                                       const Utf8Str &aGuestIp, LONG aGuestPort) RT_OVERRIDE;
    1384     HRESULT i_onStorageControllerChange(const com::Guid &aMachineId, const com::Utf8Str &aControllerName);
    1385     HRESULT i_onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce);
    1386     HRESULT i_onVMProcessPriorityChange(VMProcPriority_T aPriority);
    1387     HRESULT i_onAudioAdapterChange(IAudioAdapter *audioAdapter);
    1388     HRESULT i_onHostAudioDeviceChange(IHostAudioDevice *aDevice, BOOL aNew, AudioDeviceState_T aState, IVirtualBoxErrorInfo *aErrInfo);
    1389     HRESULT i_onSerialPortChange(ISerialPort *serialPort);
    1390     HRESULT i_onParallelPortChange(IParallelPort *parallelPort);
    1391     HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove);
    1392     HRESULT i_onVRDEServerChange(BOOL aRestart);
    1393     HRESULT i_onRecordingChange(BOOL aEnable);
    1394     HRESULT i_onUSBControllerChange();
     1384    HRESULT i_onStorageControllerChange(const com::Guid &aMachineId, const com::Utf8Str &aControllerName) RT_OVERRIDE;
     1385    HRESULT i_onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce) RT_OVERRIDE;
     1386    HRESULT i_onVMProcessPriorityChange(VMProcPriority_T aPriority) RT_OVERRIDE;
     1387    HRESULT i_onAudioAdapterChange(IAudioAdapter *audioAdapter) RT_OVERRIDE;
     1388    HRESULT i_onHostAudioDeviceChange(IHostAudioDevice *aDevice, BOOL aNew, AudioDeviceState_T aState,
     1389                                      IVirtualBoxErrorInfo *aErrInfo) RT_OVERRIDE;
     1390    HRESULT i_onSerialPortChange(ISerialPort *serialPort) RT_OVERRIDE;
     1391    HRESULT i_onParallelPortChange(IParallelPort *parallelPort) RT_OVERRIDE;
     1392    HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove) RT_OVERRIDE;
     1393    HRESULT i_onVRDEServerChange(BOOL aRestart) RT_OVERRIDE;
     1394    HRESULT i_onRecordingChange(BOOL aEnable) RT_OVERRIDE;
     1395    HRESULT i_onUSBControllerChange() RT_OVERRIDE;
    13951396    HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice,
    13961397                                IVirtualBoxErrorInfo *aError,
    … …  
    13991400    HRESULT i_onUSBDeviceDetach(IN_BSTR aId,
    14001401                                IVirtualBoxErrorInfo *aError);
    1401     HRESULT i_onSharedFolderChange();
    1402     HRESULT i_onClipboardModeChange(ClipboardMode_T aClipboardMode);
    1403     HRESULT i_onClipboardFileTransferModeChange(BOOL aEnable);
    1404     HRESULT i_onDnDModeChange(DnDMode_T aDnDMode);
    1405     HRESULT i_onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup);
    1406     HRESULT i_onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent);
    1407     HRESULT i_onCPUExecutionCapChange(ULONG aCpuExecutionCap);
    1408     HRESULT i_onGuestDebugControlChange(IGuestDebugControl *guestDebugControl);
     1402    HRESULT i_onSharedFolderChange() RT_OVERRIDE;
     1403    HRESULT i_onClipboardModeChange(ClipboardMode_T aClipboardMode) RT_OVERRIDE;
     1404    HRESULT i_onClipboardFileTransferModeChange(BOOL aEnable) RT_OVERRIDE;
     1405    HRESULT i_onDnDModeChange(DnDMode_T aDnDMode) RT_OVERRIDE;
     1406    HRESULT i_onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup) RT_OVERRIDE;
     1407    HRESULT i_onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent) RT_OVERRIDE;
     1408    HRESULT i_onCPUExecutionCapChange(ULONG aCpuExecutionCap) RT_OVERRIDE;
     1409    HRESULT i_onGuestDebugControlChange(IGuestDebugControl *guestDebugControl) RT_OVERRIDE;
    14091410
    14101411    bool i_hasMatchingUSBFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs);
    … …  
    14211422    // wrapped IInternalMachineControl methods
    14221423    HRESULT setRemoveSavedStateFile(BOOL aRemove);
    1423     HRESULT updateState(MachineState_T aState);
    1424     HRESULT beginPowerUp(const ComPtr<IProgress> &aProgress);
    1425     HRESULT endPowerUp(LONG aResult);
    1426     HRESULT beginPoweringDown(ComPtr<IProgress> &aProgress);
     1424    HRESULT updateState(MachineState_T aState) RT_OVERRIDE;
     1425    HRESULT beginPowerUp(const ComPtr<IProgress> &aProgress) RT_OVERRIDE;
     1426    HRESULT endPowerUp(LONG aResult) RT_OVERRIDE;
     1427    HRESULT beginPoweringDown(ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    14271428    HRESULT endPoweringDown(LONG aResult,
    1428                             const com::Utf8Str &aErrMsg);
     1429                            const com::Utf8Str &aErrMsg) RT_OVERRIDE;
    14291430    HRESULT runUSBDeviceFilters(const ComPtr<IUSBDevice> &aDevice,
    14301431                                BOOL *aMatched,
    1431                                 ULONG *aMaskedInterfaces);
    1432     HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename);
     1432                                ULONG *aMaskedInterfaces) RT_OVERRIDE;
     1433    HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename) RT_OVERRIDE;
    14331434    HRESULT detachUSBDevice(const com::Guid &aId,
    1434                             BOOL aDone);
    1435     HRESULT autoCaptureUSBDevices();
    1436     HRESULT detachAllUSBDevices(BOOL aDone);
     1435                            BOOL aDone) RT_OVERRIDE;
     1436    HRESULT autoCaptureUSBDevices() RT_OVERRIDE;
     1437    HRESULT detachAllUSBDevices(BOOL aDone) RT_OVERRIDE;
    14371438    HRESULT onSessionEnd(const ComPtr<ISession> &aSession,
    1438                          ComPtr<IProgress> &aProgress);
    1439     HRESULT finishOnlineMergeMedium();
     1439                         ComPtr<IProgress> &aProgress) RT_OVERRIDE;
     1440    HRESULT finishOnlineMergeMedium() RT_OVERRIDE;
    14401441    HRESULT pullGuestProperties(std::vector<com::Utf8Str> &aNames,
    14411442                                std::vector<com::Utf8Str> &aValues,
    14421443                                std::vector<LONG64> &aTimestamps,
    1443                                 std::vector<com::Utf8Str> &aFlags);
     1444                                std::vector<com::Utf8Str> &aFlags) RT_OVERRIDE;
    14441445    HRESULT pushGuestProperty(const com::Utf8Str &aName,
    14451446                              const com::Utf8Str &aValue,
    14461447                              LONG64 aTimestamp,
    14471448                              const com::Utf8Str &aFlags,
    1448                               BOOL fWasDeleted);
    1449     HRESULT lockMedia();
    1450     HRESULT unlockMedia();
     1449                              BOOL fWasDeleted) RT_OVERRIDE;
     1450    HRESULT lockMedia() RT_OVERRIDE;
     1451    HRESULT unlockMedia() RT_OVERRIDE;
    14511452    HRESULT ejectMedium(const ComPtr<IMediumAttachment> &aAttachment,
    1452                         ComPtr<IMediumAttachment> &aNewAttachment);
     1453                        ComPtr<IMediumAttachment> &aNewAttachment) RT_OVERRIDE;
    14531454    HRESULT reportVmStatistics(ULONG aValidStats,
    14541455                               ULONG aCpuUser,
    … …  
    14661467                               ULONG aMemSharedTotal,
    14671468                               ULONG aVmNetRx,
    1468                                ULONG aVmNetTx);
     1469                               ULONG aVmNetTx) RT_OVERRIDE;
    14691470    HRESULT authenticateExternal(const std::vector<com::Utf8Str> &aAuthParams,
    1470                                  com::Utf8Str &aResult);
     1471                                 com::Utf8Str &aResult) RT_OVERRIDE;
    14711472
    14721473
    … …  
    14951496    // Override some functionality for SessionMachine, this is where the
    14961497    // real action happens (the Machine methods are just dummies).
    1497     HRESULT saveState(ComPtr<IProgress> &aProgress);
    1498     HRESULT adoptSavedState(const com::Utf8Str &aSavedStateFile);
    1499     HRESULT discardSavedState(BOOL aFRemoveFile);
     1498    HRESULT saveState(ComPtr<IProgress> &aProgress) RT_OVERRIDE;
     1499    HRESULT adoptSavedState(const com::Utf8Str &aSavedStateFile) RT_OVERRIDE;
     1500    HRESULT discardSavedState(BOOL aFRemoveFile) RT_OVERRIDE;
    15001501    HRESULT takeSnapshot(const com::Utf8Str &aName,
    15011502                         const com::Utf8Str &aDescription,
    15021503                         BOOL aPause,
    15031504                         com::Guid &aId,
    1504                          ComPtr<IProgress> &aProgress);
     1505                         ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    15051506    HRESULT deleteSnapshot(const com::Guid &aId,
    1506                            ComPtr<IProgress> &aProgress);
     1507                           ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    15071508    HRESULT deleteSnapshotAndAllChildren(const com::Guid &aId,
    1508                                          ComPtr<IProgress> &aProgress);
     1509                                         ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    15091510    HRESULT deleteSnapshotRange(const com::Guid &aStartId,
    15101511                                const com::Guid &aEndId,
    1511                                 ComPtr<IProgress> &aProgress);
     1512                                ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    15121513    HRESULT restoreSnapshot(const ComPtr<ISnapshot> &aSnapshot,
    1513                             ComPtr<IProgress> &aProgress);
     1514                            ComPtr<IProgress> &aProgress) RT_OVERRIDE;
    15141515
    15151516    void i_releaseSavedStateFile(const Utf8Str &strSavedStateFile, Snapshot *pSnapshotToIgnore);
    … …  
    15561557                                bool *pfNeedsMachineSaveSettings);
    15571558
    1558     HRESULT i_setMachineState(MachineState_T aMachineState);
     1559    HRESULT i_setMachineState(MachineState_T aMachineState) RT_OVERRIDE;
    15591560    HRESULT i_updateMachineStateOnClient();
    15601561
    … …  
    16151616                             IN_GUID aSnapshotId,
    16161617                             const Utf8Str &aStateFilePath);
    1617     void uninit();
     1618    void uninit() RT_OVERRIDE;
    16181619
    16191620    // util::Lockable interface
    1620     RWLockHandle *lockHandle() const;
     1621    RWLockHandle *lockHandle() const RT_OVERRIDE;
    16211622
    16221623    // public methods only for internal purposes
    16231624
    1624     virtual bool i_isSnapshotMachine() const
     1625    virtual bool i_isSnapshotMachine() const RT_OVERRIDE
    16251626    {
    16261627        return true;

  • trunk/src/VBox/Main/include/PlatformPropertiesImpl.h

    r102113 r103977  
    5151    // public initializer/uninitializer for internal purposes only
    5252    HRESULT init(VirtualBox *aParent, bool fIsHost = false);
    53     void uninit();
     53    void uninit() RT_OVERRIDE;
    5454
    5555    // public internal methods
    … …  
    8080    HRESULT getSupportedFirmwareTypes(std::vector<FirmwareType_T> &aSupportedFirmwareTypes) RT_OVERRIDE;
    8181    HRESULT getSupportedGraphicsControllerTypes(std::vector<GraphicsControllerType_T> &aSupportedGraphicsControllerTypes) RT_OVERRIDE;
    82     HRESULT getSupportedGuestOSTypes(std::vector<ComPtr<IGuestOSType> > &aSupportedGuestOSTypes);
    83     HRESULT getSupportedNetAdpPromiscModePols(std::vector<NetworkAdapterPromiscModePolicy_T> &aSupportedNetworkAdapterPromiscModePolicies);
     82    HRESULT getSupportedGuestOSTypes(std::vector<ComPtr<IGuestOSType> > &aSupportedGuestOSTypes) RT_OVERRIDE;
     83    HRESULT getSupportedNetAdpPromiscModePols(std::vector<NetworkAdapterPromiscModePolicy_T> &aSupportedNetworkAdapterPromiscModePolicies) RT_OVERRIDE;
    8484    HRESULT getSupportedNetworkAdapterTypes(std::vector<NetworkAdapterType_T> &aSupportedNetworkAdapterTypes) RT_OVERRIDE;
    8585    HRESULT getSupportedUartTypes(std::vector<UartType_T> &aSupportedUartTypes) RT_OVERRIDE;
    8686    HRESULT getSupportedUSBControllerTypes(std::vector<USBControllerType_T> &aSupportedUSBControllerTypes) RT_OVERRIDE;
    8787    HRESULT getSupportedAudioControllerTypes(std::vector<AudioControllerType_T> &aSupportedAudioControllerTypes) RT_OVERRIDE;
    88     HRESULT getSupportedBootDevices(std::vector<DeviceType_T> &aSupportedBootDevices);
     88    HRESULT getSupportedBootDevices(std::vector<DeviceType_T> &aSupportedBootDevices) RT_OVERRIDE;
    8989    HRESULT getSupportedStorageBuses(std::vector<StorageBus_T> &aSupportedStorageBuses) RT_OVERRIDE;
    9090    HRESULT getSupportedStorageControllerTypes(std::vector<StorageControllerType_T> &aSupportedStorageControllerTypes) RT_OVERRIDE;

  • trunk/src/VBox/Main/include/ProgressProxyImpl.h

    r98103 r103977  
    7676                 ULONG uFirstOperationWeight,
    7777                 ULONG cOtherProgressObjectOperations);
    78     void    uninit();
     78    void    uninit() RT_OVERRIDE;
    7979
    8080    // IProgress properties
    81     STDMETHOD(COMGETTER(Cancelable))(BOOL *aCancelable);
    82     STDMETHOD(COMGETTER(Percent))(ULONG *aPercent);
    83     STDMETHOD(COMGETTER(TimeRemaining))(LONG *aTimeRemaining);
    84     STDMETHOD(COMGETTER(Completed))(BOOL *aCompleted);
    85     STDMETHOD(COMGETTER(Canceled))(BOOL *aCanceled);
    86     STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode);
    87     STDMETHOD(COMGETTER(ErrorInfo))(IVirtualBoxErrorInfo **aErrorInfo);
     81    STDMETHOD(COMGETTER(Cancelable))(BOOL *aCancelable) RT_OVERRIDE;
     82    STDMETHOD(COMGETTER(Percent))(ULONG *aPercent) RT_OVERRIDE;
     83    STDMETHOD(COMGETTER(TimeRemaining))(LONG *aTimeRemaining) RT_OVERRIDE;
     84    STDMETHOD(COMGETTER(Completed))(BOOL *aCompleted) RT_OVERRIDE;
     85    STDMETHOD(COMGETTER(Canceled))(BOOL *aCanceled) RT_OVERRIDE;
     86    STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) RT_OVERRIDE;
     87    STDMETHOD(COMGETTER(ErrorInfo))(IVirtualBoxErrorInfo **aErrorInfo) RT_OVERRIDE;
    8888    //STDMETHOD(COMGETTER(OperationCount))(ULONG *aOperationCount); - not necessary
    89     STDMETHOD(COMGETTER(Operation))(ULONG *aOperation);
    90     STDMETHOD(COMGETTER(OperationDescription))(BSTR *aOperationDescription);
    91     STDMETHOD(COMGETTER(OperationPercent))(ULONG *aOperationPercent);
    92     STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout);
    93     STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout);
     89    STDMETHOD(COMGETTER(Operation))(ULONG *aOperation) RT_OVERRIDE;
     90    STDMETHOD(COMGETTER(OperationDescription))(BSTR *aOperationDescription) RT_OVERRIDE;
     91    STDMETHOD(COMGETTER(OperationPercent))(ULONG *aOperationPercent) RT_OVERRIDE;
     92    STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout) RT_OVERRIDE;
     93    STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout) RT_OVERRIDE;
    9494
    9595    // IProgress methods
    96     STDMETHOD(WaitForCompletion)(LONG aTimeout);
    97     STDMETHOD(WaitForOperationCompletion)(ULONG aOperation, LONG aTimeout);
    98     STDMETHOD(Cancel)();
    99     STDMETHOD(SetCurrentOperationProgress)(ULONG aPercent);
    100     STDMETHOD(SetNextOperation)(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight);
     96    STDMETHOD(WaitForCompletion)(LONG aTimeout) RT_OVERRIDE;
     97    STDMETHOD(WaitForOperationCompletion)(ULONG aOperation, LONG aTimeout) RT_OVERRIDE;
     98    STDMETHOD(Cancel)() RT_OVERRIDE;
     99    STDMETHOD(SetCurrentOperationProgress)(ULONG aPercent) RT_OVERRIDE;
     100    STDMETHOD(SetNextOperation)(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight) RT_OVERRIDE;
    101101
    102102    // public methods only for internal purposes

  • trunk/src/VBox/Main/include/SystemPropertiesImpl.h

    r103085 r103977  
    5959    // public initializer/uninitializer for internal purposes only
    6060    HRESULT init(VirtualBox *aParent);
    61     void uninit();
     61    void uninit() RT_OVERRIDE;
    6262
    6363    // public methods for internal purposes only
    … …  
    123123    HRESULT getProxyURL(com::Utf8Str &aProxyURL) RT_OVERRIDE;
    124124    HRESULT setProxyURL(const com::Utf8Str &aProxyURL) RT_OVERRIDE;
    125     HRESULT getSupportedPlatformArchitectures(std::vector<PlatformArchitecture_T> &aSupportedPlatformArchitectures);
     125    HRESULT getSupportedPlatformArchitectures(std::vector<PlatformArchitecture_T> &aSupportedPlatformArchitectures) RT_OVERRIDE;
    126126    HRESULT getSupportedClipboardModes(std::vector<ClipboardMode_T> &aSupportedClipboardModes) RT_OVERRIDE;
    127127    HRESULT getSupportedDnDModes(std::vector<DnDMode_T> &aSupportedDnDModes) RT_OVERRIDE;

  • trunk/src/VBox/Main/include/VirtualBoxBase.h

    r98103 r103977  
    609609
    610610#define VIRTUALBOXBASE_ADD_VIRTUAL_COMPONENT_METHODS(cls, iface) \
    611     virtual const IID& getClassIID() const \
     611    virtual const IID &getClassIID() const RT_OVERRIDE \
    612612    { \
    613613        return cls::getStaticClassIID(); \
    614614    } \
    615     static const IID& getStaticClassIID() \
     615    static const IID &getStaticClassIID() \
    616616    { \
    617617        return COM_IIDOF(iface); \
    618618    } \
    619     virtual const char* getComponentName() const \
     619    virtual const char *getComponentName() const RT_OVERRIDE \
    620620    { \
    621621        return cls::getStaticComponentName(); \
    622622    } \
    623     static const char* getStaticComponentName() \
     623    static const char *getStaticComponentName() \
    624624    { \
    625625        return #cls; \
    … …  
    642642  #define VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(cls, iface) \
    643643    VIRTUALBOXBASE_ADD_VIRTUAL_COMPONENT_METHODS(cls, iface) \
    644     STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) \
     644    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) RT_OVERRIDE \
    645645    { \
    646646        const ATL::_ATL_INTMAP_ENTRY* pEntries = cls::_GetEntries(); \

  • trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h

    r98103 r103977  
    144144
    145145    // IVirtualBoxErrorInfo properties
    146     STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode);
    147     STDMETHOD(COMGETTER(ResultDetail))(LONG *aResultDetail);
    148     STDMETHOD(COMGETTER(InterfaceID))(BSTR *aIID);
    149     STDMETHOD(COMGETTER(Component))(BSTR *aComponent);
    150     STDMETHOD(COMGETTER(Text))(BSTR *aText);
    151     STDMETHOD(COMGETTER(Next))(IVirtualBoxErrorInfo **aNext);
     146    STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) RT_OVERRIDE;
     147    STDMETHOD(COMGETTER(ResultDetail))(LONG *aResultDetail) RT_OVERRIDE;
     148    STDMETHOD(COMGETTER(InterfaceID))(BSTR *aIID) RT_OVERRIDE;
     149    STDMETHOD(COMGETTER(Component))(BSTR *aComponent) RT_OVERRIDE;
     150    STDMETHOD(COMGETTER(Text))(BSTR *aText) RT_OVERRIDE;
     151    STDMETHOD(COMGETTER(Next))(IVirtualBoxErrorInfo **aNext) RT_OVERRIDE;
    152152
    153153    const char* getComponentName() const { return "VirtualBoxErrorInfo"; }

  • trunk/src/VBox/Main/src-all/EventImpl.cpp

    r98262 r103977  
    13421342
    13431343    // IEventListener methods
    1344     STDMETHOD(HandleEvent)(IEvent *)
     1344    STDMETHOD(HandleEvent)(IEvent *) RT_OVERRIDE
    13451345    {
    13461346        ComAssertMsgRet(false, (tr("HandleEvent() of wrapper shall never be called")),
    … …  
    13911391
    13921392    // IEventListener methods
    1393     STDMETHOD(HandleEvent)(IEvent *aEvent)
     1393    STDMETHOD(HandleEvent)(IEvent *aEvent) RT_OVERRIDE
    13941394    {
    13951395        BOOL fProcessed = FALSE;
    … …  
    14491449
    14501450    // IEventSource methods
    1451     STDMETHOD(CreateListener)(IEventListener **aListener);
     1451    STDMETHOD(CreateListener)(IEventListener **aListener) RT_OVERRIDE;
    14521452    STDMETHOD(CreateAggregator)(ComSafeArrayIn(IEventSource *, aSubordinates),
    1453                                 IEventSource **aAggregator);
     1453                                IEventSource **aAggregator) RT_OVERRIDE;
    14541454    STDMETHOD(RegisterListener)(IEventListener *aListener,
    14551455                                ComSafeArrayIn(VBoxEventType_T, aInterested),
    1456                                 BOOL aActive);
    1457     STDMETHOD(UnregisterListener)(IEventListener *aListener);
     1456                                BOOL aActive) RT_OVERRIDE;
     1457    STDMETHOD(UnregisterListener)(IEventListener *aListener) RT_OVERRIDE;
    14581458    STDMETHOD(FireEvent)(IEvent *aEvent,
    14591459                         LONG aTimeout,
    1460                          BOOL *aProcessed);
     1460                         BOOL *aProcessed) RT_OVERRIDE;
    14611461    STDMETHOD(GetEvent)(IEventListener *aListener,
    14621462                        LONG aTimeout,
    1463                         IEvent **aEvent);
     1463                        IEvent **aEvent) RT_OVERRIDE;
    14641464    STDMETHOD(EventProcessed)(IEventListener *aListener,
    1465                               IEvent *aEvent);
     1465                              IEvent *aEvent) RT_OVERRIDE;
    14661466
    14671467  protected:

  • trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

    r91528 r103977  
    424424#define NS_DEFAULT  = default
    425425#define NS_DELETE   = delete
     426#define NS_OVERRIDE override
    426427#else
    427428#define NS_DEFAULT
    428429#define NS_DELETE
     430#define NS_OVERRIDE
    429431#endif
    430432

  • trunk/src/libs/xpcom18a4/xpcom/glue/nsGenericFactory.h

    r1 r103977  
    5757   
    5858    /* nsIGenericFactory methods */
    59     NS_IMETHOD SetComponentInfo(const nsModuleComponentInfo *info);
    60     NS_IMETHOD GetComponentInfo(const nsModuleComponentInfo **infop);
     59    NS_IMETHOD SetComponentInfo(const nsModuleComponentInfo *info) RT_OVERRIDE;
     60    NS_IMETHOD GetComponentInfo(const nsModuleComponentInfo **infop) RT_OVERRIDE;
    6161
    62     NS_IMETHOD CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult);
     62    NS_IMETHOD CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult) RT_OVERRIDE;
    6363
    64     NS_IMETHOD LockFactory(PRBool aLock);
     64    NS_IMETHOD LockFactory(PRBool aLock) RT_OVERRIDE;
    6565
    6666    static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);

  • trunk/src/libs/xpcom18a4/xpcom/glue/nsISupportsImpl.h

    r102214 r103977  
    121121public:                                                                       \
    122122  NS_IMETHOD QueryInterface(REFNSIID aIID,                                    \
    123                             void** aInstancePtr);                             \
    124   NS_IMETHOD_(nsrefcnt) AddRef(void);                                         \
    125   NS_IMETHOD_(nsrefcnt) Release(void);                                        \
     123                            void** aInstancePtr) NS_OVERRIDE;                 \
     124  NS_IMETHOD_(nsrefcnt) AddRef(void) NS_OVERRIDE;                             \
     125  NS_IMETHOD_(nsrefcnt) Release(void) NS_OVERRIDE;                            \
    126126protected:                                                                    \
    127127  nsAutoRefCnt mRefCnt;                                                       \
    … …  
    506506public:                                                                       \
    507507  NS_IMETHOD QueryInterface(REFNSIID aIID,                                    \
    508                             void** aInstancePtr);                             \
    509   NS_IMETHOD_(nsrefcnt) AddRef(void);                                         \
    510   NS_IMETHOD_(nsrefcnt) Release(void);                                        \
     508                            void** aInstancePtr) NS_OVERRIDE;                 \
     509  NS_IMETHOD_(nsrefcnt) AddRef(void) NS_OVERRIDE;                             \
     510  NS_IMETHOD_(nsrefcnt) Release(void) NS_OVERRIDE;                            \
    511511
    512512/**

  • trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_header.c

    r103458 r103977  
    309309                FAIL;
    310310            if (!IDL_ATTR_DCL(data).f_readonly) {
    311                 fputs("; \\\n", state->file); /* Terminate the previous one. */
     311                fputs(" NS_OVERRIDE; \\\n", state->file); /* Terminate the previous one. */
    312312                write_indent(state->file);
    313313                if (!write_attr_accessor(data, state->file,
    … …  
    340340
    341341        if (IDL_LIST(iter).next != NULL) {
    342             fprintf(state->file, "; \\\n");
     342            fprintf(state->file, " NS_OVERRIDE; \\\n");
    343343        } else {
    344             fprintf(state->file, "; \n");
     344            fprintf(state->file, " NS_OVERRIDE; \n");
    345345        }
    346346    }
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