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/corelib/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/corelib/statemachine')
-rw-r--r-- | src/corelib/statemachine/qabstractstate.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qabstracttransition.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qeventtransition.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qfinalstate.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qhistorystate.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qsignaltransition.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qsignaltransition_p.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qstate.cpp | 4 | ||||
-rw-r--r-- | src/corelib/statemachine/qstate.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 8 | ||||
-rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 8 |
11 files changed, 28 insertions, 28 deletions
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 02c7d9e830..fa735ea33d 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -73,7 +73,7 @@ protected: virtual void onEntry(QEvent *event) = 0; virtual void onExit(QEvent *event) = 0; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QAbstractState(QAbstractStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index b86d26e969..ec81b8ec2e 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -102,7 +102,7 @@ protected: virtual void onTransition(QEvent *event) = 0; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 3c66e72658..53f3b4cd36 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -65,10 +65,10 @@ public: void setEventType(QEvent::Type type); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *event) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QEventTransition(QEventTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 1563bef397..3e7a844653 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -55,10 +55,10 @@ public: ~QFinalState(); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: explicit QFinalState(QFinalStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index c20053abf6..e531a2d9fb 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -80,10 +80,10 @@ Q_SIGNALS: void historyTypeChanged(QPrivateSignal); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QHistoryState) diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index 97c2916d9a..e64d09384a 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -80,10 +80,10 @@ public: void setSignal(const QByteArray &signal); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *event) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; Q_SIGNALS: void senderObjectChanged(QPrivateSignal); diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index f270a5be4a..0666e600a4 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -70,7 +70,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e) Q_DECL_OVERRIDE; + virtual void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 76dcbf784b..ada20cd6a5 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -396,8 +396,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) Q_DECL_OVERRIDE {} - bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } + void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 33f84c2de0..1b39d37f3d 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -116,10 +116,10 @@ Q_SIGNALS: void errorStateChanged(QPrivateSignal); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QState(QStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 1d80da55c9..b6f0420db0 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1721,8 +1721,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } - virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {} + virtual bool eventTest(QEvent *) override { return true; } + virtual void onTransition(QEvent *) override {} }; QState *root = rootState(); @@ -2126,8 +2126,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) Q_DECL_OVERRIDE { deleteLater(); } - bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } + void onTransition(QEvent *) override { deleteLater(); } + bool eventTest(QEvent *) override { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 4f31252eed..7268d0f233 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -141,7 +141,7 @@ public: QSet<QAbstractState*> configuration() const; #if QT_CONFIG(qeventtransition) - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; #endif public Q_SLOTS: @@ -156,8 +156,8 @@ Q_SIGNALS: protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; virtual void beginSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event); @@ -165,7 +165,7 @@ protected: virtual void beginMicrostep(QEvent *event); virtual void endMicrostep(QEvent *event); - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QStateMachine(QStateMachinePrivate &dd, QObject *parent); |