summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstate.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-04-29 09:40:38 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-04-29 09:41:13 (GMT)
commitfa612960f423aa413d6d83813807a470aef27d7d (patch)
tree0eda17fc34fd88831cb15168b28eba0e1ca4e5a3 /src/corelib/statemachine/qstate.h
parentc731d50a8ac908da982c911c73509cdd766c4c0f (diff)
downloadQt-fa612960f423aa413d6d83813807a470aef27d7d.zip
Qt-fa612960f423aa413d6d83813807a470aef27d7d.tar.gz
Qt-fa612960f423aa413d6d83813807a470aef27d7d.tar.bz2
replace QState::Type with QState::childMode property
Result of API review.
Diffstat (limited to 'src/corelib/statemachine/qstate.h')
-rw-r--r--src/corelib/statemachine/qstate.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 33f0709..926d41f 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -55,21 +55,24 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Core)
class QAbstractTransition;
-class QHistoryState;
class QSignalTransition;
class QStatePrivate;
class Q_CORE_EXPORT QState : public QAbstractState
{
Q_OBJECT
+ Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState)
+ Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState)
+ Q_PROPERTY(ChildMode childMode READ childMode WRITE setChildMode)
+ Q_ENUMS(ChildMode)
public:
- enum Type {
- Normal,
- ParallelGroup
+ enum ChildMode {
+ ExclusiveStates,
+ ParallelStates
};
QState(QState *parent = 0);
- QState(Type type, QState *parent = 0);
+ QState(ChildMode childMode, QState *parent = 0);
~QState();
QAbstractState *errorState() const;
@@ -84,6 +87,9 @@ public:
QAbstractState *initialState() const;
void setInitialState(QAbstractState *state);
+ ChildMode childMode() const;
+ void setChildMode(ChildMode mode);
+
void assignProperty(QObject *object, const char *name,
const QVariant &value);