Make it harder to accidentally delete a binding

1 files changed, 7 insertions, 5 deletions

diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 533b6d4..56f1715 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -68,7 +68,6 @@ class Q_DECLARATIVE_EXPORT QDeclarativeAbstractBinding
 {
 public:
     QDeclarativeAbstractBinding();
-    virtual ~QDeclarativeAbstractBinding();
 
     virtual void destroy();
 
@@ -88,14 +87,15 @@ public:
     void removeFromObject();
 
 protected:
+    virtual ~QDeclarativeAbstractBinding();
     void clear();
 
 private:
+
     friend class QDeclarativeDeclarativeData;
-    friend class QDeclarativeProperty;
+    friend class QDeclarativeValueTypeProxyBinding;
     friend class QDeclarativePropertyPrivate;
     friend class QDeclarativeVME;
-    friend class QDeclarativeValueTypeProxyBinding;
 
     QObject *m_object;
     QDeclarativeAbstractBinding **m_mePtr;
@@ -107,7 +107,6 @@ class QDeclarativeValueTypeProxyBinding : public QDeclarativeAbstractBinding
 {
 public:
     QDeclarativeValueTypeProxyBinding(QObject *o, int coreIndex);
-    virtual ~QDeclarativeValueTypeProxyBinding();
 
     virtual Type bindingType() const { return ValueTypeProxy; }
 
@@ -117,6 +116,9 @@ public:
 
     QDeclarativeAbstractBinding *binding(int propertyIndex);
 
+protected:
+    ~QDeclarativeValueTypeProxyBinding();
+
 private:
     void recursiveEnable(QDeclarativeAbstractBinding *, QDeclarativePropertyPrivate::WriteFlags);
     void recursiveDisable(QDeclarativeAbstractBinding *);
@@ -137,7 +139,6 @@ public:
     QDeclarativeBinding(const QString &, QObject *, QDeclarativeContextData *, QObject *parent=0);
     QDeclarativeBinding(void *, QDeclarativeRefCount *, QObject *, QDeclarativeContextData *, 
                         const QString &, int, QObject *parent);
-    ~QDeclarativeBinding();
 
     void setTarget(const QDeclarativeProperty &);
     QDeclarativeProperty property() const;
@@ -154,6 +155,7 @@ public Q_SLOTS:
     void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
 
 protected:
+    ~QDeclarativeBinding();
     void emitValueChanged();
 
 private: