diff options
Diffstat (limited to 'src/widgets/statemachine')
-rw-r--r-- | src/widgets/statemachine/qbasickeyeventtransition_p.h | 8 | ||||
-rw-r--r-- | src/widgets/statemachine/qbasicmouseeventtransition_p.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index 5007b79739..f23c078570 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -63,11 +63,11 @@ class Q_AUTOTEST_EXPORT QBasicKeyEventTransition : public QAbstractTransition { Q_OBJECT public: - QBasicKeyEventTransition(QState *sourceState = 0); - QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = 0); + QBasicKeyEventTransition(QState *sourceState = nullptr); + QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = nullptr); QBasicKeyEventTransition(QEvent::Type type, int key, Qt::KeyboardModifiers modifierMask, - QState *sourceState = 0); + QState *sourceState = nullptr); ~QBasicKeyEventTransition(); QEvent::Type eventType() const; @@ -84,7 +84,7 @@ protected: void onTransition(QEvent *) override; private: - Q_DISABLE_COPY(QBasicKeyEventTransition) + Q_DISABLE_COPY_MOVE(QBasicKeyEventTransition) Q_DECLARE_PRIVATE(QBasicKeyEventTransition) }; diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index 93d2a5ec61..dd619d189c 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -65,9 +65,9 @@ class Q_AUTOTEST_EXPORT QBasicMouseEventTransition : public QAbstractTransition { Q_OBJECT public: - QBasicMouseEventTransition(QState *sourceState = 0); + QBasicMouseEventTransition(QState *sourceState = nullptr); QBasicMouseEventTransition(QEvent::Type type, Qt::MouseButton button, - QState *sourceState = 0); + QState *sourceState = nullptr); ~QBasicMouseEventTransition(); QEvent::Type eventType() const; @@ -87,7 +87,7 @@ protected: void onTransition(QEvent *) override; private: - Q_DISABLE_COPY(QBasicMouseEventTransition) + Q_DISABLE_COPY_MOVE(QBasicMouseEventTransition) Q_DECLARE_PRIVATE(QBasicMouseEventTransition) }; |