From 56805f1f4d001f83f888b01076b495798378a92c Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 30 Jul 2009 09:58:56 +1000 Subject: Fix regression introduced in classComplete -> componentComplete. --- src/declarative/util/qmlstategroup.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index ed9221b..3a07fbe 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -134,6 +134,18 @@ void QmlStateGroup::classBegin() d->componentComplete = false; } +void QmlStateGroup::componentComplete() +{ + Q_D(QmlStateGroup); + d->componentComplete = true; + d->updateAutoState(); + if (!d->currentState.isEmpty()) { + QString cs = d->currentState; + d->currentState = QString(); + d->setCurrentStateInternal(cs, true); + } +} + void QmlStateGroup::updateAutoState() { Q_D(QmlStateGroup); @@ -270,18 +282,6 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state, newState->apply(q, transition, oldState); } -void QmlStateGroup::componentComplete() -{ - Q_D(QmlStateGroup); - d->updateAutoState(); - d->componentComplete = true; - if (!d->currentState.isEmpty()) { - QString cs = d->currentState; - d->currentState = QString(); - d->setCurrentStateInternal(cs, true); - } -} - QmlState *QmlStateGroup::findState(const QString &name) const { Q_D(const QmlStateGroup); -- cgit v0.12