diff options
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r-- | src/corelib/statemachine/qsignaleventgenerator_p.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qsignaltransition_p.h | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h index 271f6317bd..72592b8731 100644 --- a/src/corelib/statemachine/qsignaleventgenerator_p.h +++ b/src/corelib/statemachine/qsignaleventgenerator_p.h @@ -71,7 +71,7 @@ private: void execute(void **_a); private: - Q_DISABLE_COPY(QSignalEventGenerator) + Q_DISABLE_COPY_MOVE(QSignalEventGenerator) }; QT_END_NAMESPACE diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 0666e600a4..b3de334677 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) override; + void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 7388d496d9..ee3f7be279 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 *) override { return true; } - virtual void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } + void onTransition(QEvent *) override {} }; QState *root = rootState(); |