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/qtabbar.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/qtabbar.h')
| -rw-r--r-- | src/widgets/widgets/qtabbar.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index ebcd1094ef..d602a8fc30 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -136,8 +136,8 @@ public: int currentIndex() const; int count() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setDrawBase(bool drawTheBase); bool drawBase() const; @@ -194,20 +194,20 @@ protected: virtual void tabRemoved(int index); virtual void tabLayoutChange(); - bool event(QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent (QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void resizeEvent(QResizeEvent *) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent (QMouseEvent *) override; + void mouseMoveEvent (QMouseEvent *) override; + void mouseReleaseEvent (QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *) override; + void changeEvent(QEvent *) override; + void timerEvent(QTimerEvent *event) override; void initStyleOption(QStyleOptionTab *option, int tabIndex) const; #ifndef QT_NO_ACCESSIBILITY |