diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-08-10 19:31:57 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-02-04 14:59:35 +0000 |
| commit | 7d6c6bc082dc4c93078c5803f0b6cc536474b9b1 (patch) | |
| tree | c47951a8607dbc059ee1bab69f82344be1096805 /src/corelib/statemachine | |
| parent | d446b1a5ef1f58d26b226dc185259cc2ab168db2 (diff) | |
Use Q_ENUM and Q_FLAG for types in QtCore
Change-Id: I33590a9c4c6d87c5bbba1d201e32c6bf1bd3e00b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qhistorystate.h | 2 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstate.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index ee80a0bc15..cccf5430a8 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -47,12 +47,12 @@ class Q_CORE_EXPORT QHistoryState : public QAbstractState Q_OBJECT Q_PROPERTY(QAbstractState* defaultState READ defaultState WRITE setDefaultState NOTIFY defaultStateChanged) Q_PROPERTY(HistoryType historyType READ historyType WRITE setHistoryType NOTIFY historyTypeChanged) - Q_ENUMS(HistoryType) public: enum HistoryType { ShallowHistory, DeepHistory }; + Q_ENUM(HistoryType) QHistoryState(QState *parent = 0); QHistoryState(HistoryType type, QState *parent = 0); diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 8a308cf38e..65e927e07a 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -53,17 +53,18 @@ class Q_CORE_EXPORT QState : public QAbstractState Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState NOTIFY initialStateChanged) Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState NOTIFY errorStateChanged) Q_PROPERTY(ChildMode childMode READ childMode WRITE setChildMode NOTIFY childModeChanged) - Q_ENUMS(ChildMode RestorePolicy) public: enum ChildMode { ExclusiveStates, ParallelStates }; + Q_ENUM(ChildMode) enum RestorePolicy { DontRestoreProperties, RestoreProperties }; + Q_ENUM(RestorePolicy) QState(QState *parent = 0); QState(ChildMode childMode, QState *parent = 0); |