diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-29 06:00:33 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-29 06:00:33 (GMT) |
commit | a915df4fa1217d2670348029d2d9fb709118ddc2 (patch) | |
tree | afcd405b2a046a6d2dbce9be4b3e6559eb9dfbdc /src/declarative/util | |
parent | 9abd22080de9898a5edf0cb4d9973d3ce611af62 (diff) | |
download | Qt-a915df4fa1217d2670348029d2d9fb709118ddc2.zip Qt-a915df4fa1217d2670348029d2d9fb709118ddc2.tar.gz Qt-a915df4fa1217d2670348029d2d9fb709118ddc2.tar.bz2 |
Get rid of classComplete.
componentComplete is always what is wanted.
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qmlstategroup.cpp | 13 | ||||
-rw-r--r-- | src/declarative/util/qmlstategroup.h | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 13a0023..ed9221b 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -56,8 +56,7 @@ class QmlStateGroupPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QmlStateGroup) public: QmlStateGroupPrivate(QmlStateGroup *p) - : nullState(0), states(p), classComplete(true), - componentComplete(true), ignoreTrans(false) {} + : nullState(0), states(p), componentComplete(true), ignoreTrans(false) {} QString currentState; QmlState *nullState; @@ -76,7 +75,6 @@ public: StateList states; QmlConcreteList<QmlTransition *> transitions; - bool classComplete; bool componentComplete; bool ignoreTrans; @@ -133,16 +131,9 @@ void QmlStateGroup::setState(const QString &state) void QmlStateGroup::classBegin() { Q_D(QmlStateGroup); - d->classComplete = false; d->componentComplete = false; } -void QmlStateGroup::classComplete() -{ - Q_D(QmlStateGroup); - d->classComplete = true; -} - void QmlStateGroup::updateAutoState() { Q_D(QmlStateGroup); @@ -152,7 +143,7 @@ void QmlStateGroup::updateAutoState() void QmlStateGroupPrivate::updateAutoState() { Q_Q(QmlStateGroup); - if (!classComplete) + if (!componentComplete) return; bool revert = false; diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h index a817bd0..cf79eb4 100644 --- a/src/declarative/util/qmlstategroup.h +++ b/src/declarative/util/qmlstategroup.h @@ -76,7 +76,6 @@ public: QmlState *findState(const QString &name) const; virtual void classBegin(); - virtual void classComplete(); virtual void componentComplete(); Q_SIGNALS: void stateChanged(const QString &); |