diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-25 02:45:38 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-25 02:46:48 (GMT) |
commit | a645ab52a7ba10018419b552b8f50ce4b7ad9cd8 (patch) | |
tree | 38b3267a4258331ffe22508949869b07f0887c33 /src/declarative/util/qdeclarativestate.cpp | |
parent | 35f6b95744164e635fb8a03e34b2dd6177a50ccf (diff) | |
download | Qt-a645ab52a7ba10018419b552b8f50ce4b7ad9cd8.zip Qt-a645ab52a7ba10018419b552b8f50ce4b7ad9cd8.tar.gz Qt-a645ab52a7ba10018419b552b8f50ce4b7ad9cd8.tar.bz2 |
Move private QDeclarativeMetaProperty functions into the private class
We don't want to allow manipulation of bindings and signal properties through
the public API. Equivalents of the public functions now exist in
QDeclarativeMetaPropertyPrivate for internal use.
Diffstat (limited to 'src/declarative/util/qdeclarativestate.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 5c3b909..d1dd318 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) { - property.setBinding(0); + QDeclarativeMetaPropertyPrivate::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 = action.property.binding(); + action.fromBinding = QDeclarativeMetaPropertyPrivate::binding(action.property); for (jj = 0; jj < d->revertList.count(); ++jj) { if (d->revertList.at(jj).property == action.property) { @@ -436,7 +436,8 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit } if (!found) { QVariant cur = d->revertList.at(ii).property.read(); - QDeclarativeAbstractBinding *delBinding = d->revertList.at(ii).property.setBinding(0); + QDeclarativeAbstractBinding *delBinding = + QDeclarativeMetaPropertyPrivate::setBinding(d->revertList.at(ii).property, 0); if (delBinding) delBinding->destroy(); |