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/qtabwidget.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/qtabwidget.h')
-rw-r--r-- | src/widgets/widgets/qtabwidget.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index b80fdba1fb..17667f2f8a 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -120,10 +120,10 @@ public: TabShape tabShape() const; void setTabShape(TabShape s); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; + int heightForWidth(int width) const override; + bool hasHeightForWidth() const override; void setCornerWidget(QWidget * w, Qt::Corner corner = Qt::TopRightCorner); QWidget * cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const; @@ -161,13 +161,13 @@ protected: virtual void tabInserted(int index); virtual void tabRemoved(int index); - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void paintEvent(QPaintEvent *) override; void setTabBar(QTabBar *); - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + bool event(QEvent *) override; void initStyleOption(QStyleOptionTabWidgetFrame *option) const; |