diff options
Diffstat (limited to 'src/corelib/statemachine/qstate.cpp')
-rw-r--r-- | src/corelib/statemachine/qstate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 76dcbf784b..6efa4897d6 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 @@ -524,7 +524,7 @@ void QState::setChildMode(ChildMode mode) if (mode == QState::ParallelStates && d->initialState) { qWarning("QState::setChildMode: setting the child-mode of state %p to " "parallel removes the initial state", this); - d->initialState = Q_NULLPTR; + d->initialState = nullptr; emit initialStateChanged(QState::QPrivateSignal()); } |