1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 0b9bde6..7823a3d 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -78,14 +78,16 @@ public:
     enum Type { PropertyBinding, ValueTypeProxy };
     virtual Type bindingType() const { return PropertyBinding; }
 
+    QObject *object() const;
+    int propertyIndex() const;
+
     void setEnabled(bool e) { setEnabled(e, QDeclarativePropertyPrivate::DontRemoveBinding); }
     virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags) = 0;
-    virtual int propertyIndex() = 0;
 
     void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
     virtual void update(QDeclarativePropertyPrivate::WriteFlags) = 0;
 
-    void addToObject(QObject *);
+    void addToObject(QObject *, int);
     void removeFromObject();
 
     static Pointer getPointer(QDeclarativeAbstractBinding *p) { return p ? p->weakPointer() : Pointer(); }
@@ -98,12 +100,14 @@ private:
     Pointer weakPointer();
 
     friend class QDeclarativeData;
+    friend class QDeclarativeComponentPrivate;
     friend class QDeclarativeValueTypeProxyBinding;
     friend class QDeclarativePropertyPrivate;
     friend class QDeclarativeVME;
     friend class QtSharedPointer::ExternalRefCount<QDeclarativeAbstractBinding>;
 
     QObject *m_object;
+    int m_propertyIndex;
     QDeclarativeAbstractBinding **m_mePtr;
     QDeclarativeAbstractBinding **m_prevBinding;
     QDeclarativeAbstractBinding  *m_nextBinding;
@@ -118,11 +122,12 @@ public:
     virtual Type bindingType() const { return ValueTypeProxy; }
 
     virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags);
-    virtual int propertyIndex();
     virtual void update(QDeclarativePropertyPrivate::WriteFlags);
 
     QDeclarativeAbstractBinding *binding(int propertyIndex);
 
+    void removeBindings(quint32 mask);
+
 protected:
     ~QDeclarativeValueTypeProxyBinding();
 
@@ -154,7 +159,6 @@ public:
 
     // Inherited from  QDeclarativeAbstractBinding
     virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
-    virtual int propertyIndex();
     virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
     virtual QString expression() const;