diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
| commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
| tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/widgets/widgets/qmenu.h | |
| parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) | |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/widgets/qmenu.h')
| -rw-r--r-- | src/widgets/widgets/qmenu.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 61849790cf..56b8e011b9 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -195,7 +195,7 @@ public: static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR); #endif - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QRect actionGeometry(QAction *) const; QAction *actionAt(const QPoint &) const; @@ -232,22 +232,22 @@ Q_SIGNALS: protected: int columnCount() const; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif - void enterEvent(QEvent *) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void actionEvent(QActionEvent *) override; + void timerEvent(QTimerEvent *) override; + bool event(QEvent *) override; + bool focusNextPrevChild(bool next) override; void initStyleOption(QStyleOptionMenuItem *option, const QAction *action) const; private Q_SLOTS: |