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.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 5907ddb..ad39574 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -50,6 +50,7 @@
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeguard_p.h>
+#include <qdeclarativemetaproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -132,12 +133,12 @@ public:
     QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
 
     virtual void execute() {
-        ownedExpression = property.setSignalExpression(expression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, expression);
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse() {
-        ownedExpression = property.setSignalExpression(reverseExpression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, reverseExpression);
     }
 
     virtual void saveOriginals() {
@@ -146,9 +147,11 @@ public:
     }
 
     virtual void rewind() {
-        ownedExpression = property.setSignalExpression(rewindExpression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, rewindExpression);
+    }
+    virtual void saveCurrentValues() { 
+        rewindExpression = QDeclarativeMetaPropertyPrivate::signalExpression(property); 
     }
-    virtual void saveCurrentValues() { rewindExpression = property.signalExpression(); }
 
     virtual bool override(QDeclarativeActionEvent*other) {
         if (other == this)