diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
commit | 5b52c348243e6459cc7faa4ee76a23c7fadcd299 (patch) | |
tree | be4bee855e535651b5fa22e9554ce1732f6ece70 /src/declarative/util/qmlstate_p.h | |
parent | 2020c692803a8a7839d85860d05174a193d9a848 (diff) | |
parent | 0362832c16f95c2909e2a68351e15242b7d1b795 (diff) | |
download | Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.zip Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.gz Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlstate_p.h')
-rw-r--r-- | src/declarative/util/qmlstate_p.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index da8fdcd..7fcbcd7 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -48,6 +48,29 @@ QT_BEGIN_NAMESPACE +class SimpleAction +{ +public: + enum State { StartState, EndState }; + SimpleAction(const Action &a, State state = StartState) : bv(0) + { + property = a.property; + if (state == StartState) { + value = a.fromValue; + binding = a.fromBinding; + } else { + value = a.toValue; + binding = a.toBinding; + } + bv = a.bv; + } + + QmlMetaProperty property; + QVariant value; + QString binding; + QmlBindableValue *bv; +}; + class QmlStatePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QmlState) @@ -56,13 +79,15 @@ public: QmlStatePrivate() : when(0), transition(0), inState(false), group(0) {} + typedef QList<SimpleAction> SimpleActionList; + QString name; QmlBindableValue *when; QmlConcreteList<QmlStateOperation *> operations; QmlTransition *transition; - QmlStateOperation::RevertActionList revertList; + SimpleActionList revertList; QList<QmlMetaProperty> reverting; - QmlStateOperation::RevertActionList completeList; + SimpleActionList completeList; QmlStateOperation::ActionList bindingsList; QString extends; mutable bool inState; |