diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-25 10:01:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-25 10:02:54 (GMT) |
| commit | f5bb807d6938fbd39ea1f99ed45c817d538e4287 (patch) | |
| tree | b3e1705e4703c5d7da5ffca3010d062644a62ae3 /src/declarative/util/qdeclarativestate.cpp | |
| parent | 0e4dd15a90c119cea4ada833d88b51e336f53ee7 (diff) | |
| download | Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.zip Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.gz Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.bz2 | |
Rename QDeclarativeMetaProperty -> QDeclarativeProperty
There's nothing meta about our properties.
Diffstat (limited to 'src/declarative/util/qdeclarativestate.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 3b06e33..1d70d33 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -334,7 +334,7 @@ void QDeclarativeState::cancel() void QDeclarativeAction::deleteFromBinding() { if (fromBinding) { - QDeclarativeMetaPropertyPrivate::setBinding(property, 0); + QDeclarativePropertyPrivate::setBinding(property, 0); fromBinding->destroy(); fromBinding = 0; } @@ -388,7 +388,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit else if (action.event->isRewindable()) action.event->saveCurrentValues(); } else { - action.fromBinding = QDeclarativeMetaPropertyPrivate::binding(action.property); + action.fromBinding = QDeclarativePropertyPrivate::binding(action.property); for (jj = 0; jj < d->revertList.count(); ++jj) { if (d->revertList.at(jj).property == action.property) { @@ -437,7 +437,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit if (!found) { QVariant cur = d->revertList.at(ii).property.read(); QDeclarativeAbstractBinding *delBinding = - QDeclarativeMetaPropertyPrivate::setBinding(d->revertList.at(ii).property, 0); + QDeclarativePropertyPrivate::setBinding(d->revertList.at(ii).property, 0); if (delBinding) delBinding->destroy(); |