diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-07-13 19:30:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 10:08:28 +0200 |
| commit | cd1351401ffdfe5e6097b4b41a632655f9fa6e03 (patch) | |
| tree | 0d9ab87aaa646a04d471751706221d733078b4b2 /src/corelib/statemachine/qstatemachine.h | |
| parent | 0b66f723f06f6d115ea37d4db8bb6c0b5f63885b (diff) | |
statemachine: Move RestorePolicy enum to QState class
This makes it possible to add API for setting the restore policy
per state, or even per property assignment (QTBUG-17861).
This change is fully source compatible with Qt4.
Change-Id: I53628546b070f6fc84891f86e7ad7bd8ef5ba285
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.h')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 964b89a66e..cc9c8aa652 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -63,8 +63,7 @@ class Q_CORE_EXPORT QStateMachine : public QState { Q_OBJECT Q_PROPERTY(QString errorString READ errorString) - Q_PROPERTY(RestorePolicy globalRestorePolicy READ globalRestorePolicy WRITE setGlobalRestorePolicy) - Q_ENUMS(RestorePolicy) + Q_PROPERTY(QState::RestorePolicy globalRestorePolicy READ globalRestorePolicy WRITE setGlobalRestorePolicy) #ifndef QT_NO_ANIMATION Q_PROPERTY(bool animated READ isAnimated WRITE setAnimated) #endif @@ -107,11 +106,6 @@ public: HighPriority }; - enum RestorePolicy { - DontRestoreProperties, - RestoreProperties - }; - enum Error { NoError, NoInitialStateError, @@ -141,8 +135,8 @@ public: void removeDefaultAnimation(QAbstractAnimation *animation); #endif // QT_NO_ANIMATION - QStateMachine::RestorePolicy globalRestorePolicy() const; - void setGlobalRestorePolicy(QStateMachine::RestorePolicy restorePolicy); + QState::RestorePolicy globalRestorePolicy() const; + void setGlobalRestorePolicy(QState::RestorePolicy restorePolicy); void postEvent(QEvent *event, EventPriority priority = NormalPriority); int postDelayedEvent(QEvent *event, int delay); |