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/statemachine | |
| 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/statemachine')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index d3b90f6104..5007b79739 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -80,8 +80,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicKeyEventTransition) diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index d6d37eb03e..93d2a5ec61 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -83,8 +83,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicMouseEventTransition) diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index 23ce3c40be..b8c4a99710 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -66,8 +66,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QKeyEventTransition) diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 3f40224d8c..49fc156a51 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -70,8 +70,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QMouseEventTransition) |