diff options
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 5f2216a9da..a6a4753d71 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -76,7 +76,7 @@ protected: virtual void onEntry(QEvent *event) = 0; virtual void onExit(QEvent *event) = 0; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QAbstractState(QAbstractStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index 2676aba633..e9c757c3a2 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -99,7 +99,7 @@ protected: virtual void onTransition(QEvent *event) = 0; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index bf282242d6..861aacd51a 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -60,10 +60,10 @@ public: void setEventType(QEvent::Type type); protected: - bool eventTest(QEvent *event); - void onTransition(QEvent *event); + bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QEventTransition(QEventTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 804851c321..ca8875abea 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -50,10 +50,10 @@ public: ~QFinalState(); protected: - void onEntry(QEvent *event); - void onExit(QEvent *event); + void onEntry(QEvent *event) Q_DECL_OVERRIDE; + void onExit(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QFinalState) diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index d05e4ba5eb..ee80a0bc15 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -77,10 +77,10 @@ Q_SIGNALS: ); protected: - void onEntry(QEvent *event); - void onExit(QEvent *event); + void onEntry(QEvent *event) Q_DECL_OVERRIDE; + void onExit(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QHistoryState) diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index 545374eb5c..8300c77b9e 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -61,10 +61,10 @@ public: void setSignal(const QByteArray &signal); protected: - bool eventTest(QEvent *event); - void onTransition(QEvent *event); + bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; Q_SIGNALS: void senderObjectChanged( diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 1d09babe88..f394bfc74f 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -61,7 +61,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e); + virtual void callOnTransition(QEvent *e) Q_DECL_OVERRIDE; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 29698d204f..b68dc88fb1 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -383,8 +383,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) {} - bool eventTest(QEvent *) { return true; } + void onTransition(QEvent *) Q_DECL_OVERRIDE {} + bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index dbc1ca97f9..a9fd04bf00 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -117,10 +117,10 @@ Q_SIGNALS: ); protected: - void onEntry(QEvent *event); - void onExit(QEvent *event); + void onEntry(QEvent *event) Q_DECL_OVERRIDE; + void onExit(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QState(QStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 1350c8d99e..69e942d4fd 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1303,8 +1303,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) { return true; } - virtual void onTransition(QEvent *) {} + virtual bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } + virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {} }; QState *root = rootState(); @@ -1629,8 +1629,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) { deleteLater(); } - bool eventTest(QEvent *) { return true; } + void onTransition(QEvent *) Q_DECL_OVERRIDE { deleteLater(); } + bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 5f203d5ed4..3a4944a8db 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -136,7 +136,7 @@ public: QSet<QAbstractState*> configuration() const; #ifndef QT_NO_STATEMACHINE_EVENTFILTER - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; #endif public Q_SLOTS: @@ -159,8 +159,8 @@ Q_SIGNALS: protected: - void onEntry(QEvent *event); - void onExit(QEvent *event); + void onEntry(QEvent *event) Q_DECL_OVERRIDE; + void onExit(QEvent *event) Q_DECL_OVERRIDE; virtual void beginSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event); @@ -168,7 +168,7 @@ protected: virtual void beginMicrostep(QEvent *event); virtual void endMicrostep(QEvent *event); - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QStateMachine(QStateMachinePrivate &dd, QObject *parent); |