diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-05 05:59:12 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-05 05:59:12 (GMT) |
| commit | 254029b3ff6f14674c54c68443a5a53460e75426 (patch) | |
| tree | 6ea44b07f9a127745da6801611e80c7a09231878 /src/declarative/util/qmlstate_p_p.h | |
| parent | d8398192d50ce9e664910ebdd42b7ada5eabaacb (diff) | |
| download | Qt-254029b3ff6f14674c54c68443a5a53460e75426.zip Qt-254029b3ff6f14674c54c68443a5a53460e75426.tar.gz Qt-254029b3ff6f14674c54c68443a5a53460e75426.tar.bz2 | |
Pass symbols::prefix (Action -> QmlAction)
Diffstat (limited to 'src/declarative/util/qmlstate_p_p.h')
| -rw-r--r-- | src/declarative/util/qmlstate_p_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h index 0ae72cd..235fe62 100644 --- a/src/declarative/util/qmlstate_p_p.h +++ b/src/declarative/util/qmlstate_p_p.h @@ -64,11 +64,11 @@ QT_BEGIN_NAMESPACE -class SimpleAction +class QmlSimpleAction { public: enum State { StartState, EndState }; - SimpleAction(const Action &a, State state = StartState) + QmlSimpleAction(const QmlAction &a, State state = StartState) { property = a.property; specifiedObject = a.specifiedObject; @@ -90,7 +90,7 @@ public: QmlAbstractBinding *binding; QObject *specifiedObject; QString specifiedProperty; - ActionEvent *event; + QmlActionEvent *event; bool reverseEvent; }; @@ -102,7 +102,7 @@ public: QmlStatePrivate() : when(0), inState(false), group(0) {} - typedef QList<SimpleAction> SimpleActionList; + typedef QList<QmlSimpleAction> SimpleActionList; QString name; QmlBinding *when; |