1 files changed, 13 insertions, 73 deletions

diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h
index b5d8181ca5..d4cb4e0e9e 100644
--- a/src/qml/qml/qqmlabstractbinding_p.h
+++ b/src/qml/qml/qqmlabstractbinding_p.h
@@ -57,60 +57,29 @@ class QQmlObjectCreator;
 class Q_QML_PRIVATE_EXPORT QQmlAbstractBinding
 {
 public:
-    enum DestroyMode {
-
-        // The binding should disconnect itself upon destroy
-        DisconnectBinding,
-
-        // The binding doesn't need to disconnect itself, but it can if it wants to.
-        //
-        // This is used in QQmlData::destroyed() - at the point at which the bindings are
-        // destroyed, the notifiers are already disconnected, so no need to disconnect each
-        // binding again.
-        //
-        // Bindings can use this flag to speed up destruction, especially for v4 bindings
-        // disconnecting a single binding might be slow.
-        KeepBindingConnected
-    };
-
-    struct VTable {
-        void (*destroy)(QQmlAbstractBinding *, DestroyMode destroyMode);
-        QString (*expression)(const QQmlAbstractBinding *);
-        int (*propertyIndex)(const QQmlAbstractBinding *);
-        QObject *(*object)(const QQmlAbstractBinding *);
-        void (*setEnabled)(QQmlAbstractBinding *, bool, QQmlPropertyPrivate::WriteFlags);
-        void (*update)(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags);
-        void (*retargetBinding)(QQmlAbstractBinding *, QObject *, int);
-    };
-
     typedef QWeakPointer<QQmlAbstractBinding> Pointer;
 
     enum BindingType { Binding = 0, ValueTypeProxy = 1 };
     inline BindingType bindingType() const;
 
-    // Destroy the binding.  Use this instead of calling delete.
-    // Bindings are free to implement their own memory management, so the delete operator is
-    // not necessarily safe.  The default implementation clears the binding, removes it from
-    // the object and calls delete.
-    void destroy(DestroyMode destroyMode = DisconnectBinding)
-    { vtable()->destroy(this, destroyMode); }
+    void destroy() {
+        removeFromObject();
+        clear();
+        delete this;
+    }
 
-    QString expression() const { return vtable()->expression(this); }
+    virtual QString expression() const;
 
     // Should return the encoded property index for the binding.  Should return this value
     // even if the binding is not enabled or added to an object.
     // Encoding is:  coreIndex | (valueTypeIndex << 16)
-    int propertyIndex() const { return vtable()->propertyIndex(this); }
+    virtual int targetPropertyIndex() const = 0;
 
     // Should return the object for the binding.  Should return this object even if the
     // binding is not enabled or added to the object.
-    QObject *object() const { return vtable()->object(this); }
-
-    void setEnabled(bool e) { setEnabled(e, QQmlPropertyPrivate::DontRemoveBinding); }
-    void setEnabled(bool e, QQmlPropertyPrivate::WriteFlags f) { vtable()->setEnabled(this, e, f); }
+    virtual QObject *targetObject() const = 0;
 
-    void update() { update(QQmlPropertyPrivate::DontRemoveBinding); }
-    void update(QQmlPropertyPrivate::WriteFlags f) { vtable()->update(this, f); }
+    virtual void setEnabled(bool e, QQmlPropertyPrivate::WriteFlags f = QQmlPropertyPrivate::DontRemoveBinding) = 0;
 
     void addToObject();
     void removeFromObject();
@@ -118,33 +87,20 @@ public:
     static inline Pointer getPointer(QQmlAbstractBinding *p);
     static void printBindingLoopError(QQmlProperty &prop);
 
-    // Default implementation for some VTable functions
-    template<typename T>
-    static void default_destroy(QQmlAbstractBinding *, DestroyMode);
-    static QString default_expression(const QQmlAbstractBinding *);
-    static void default_retargetBinding(QQmlAbstractBinding *, QObject *, int);
+    inline QQmlAbstractBinding *nextBinding() const;
 
 protected:
     QQmlAbstractBinding(BindingType);
-    ~QQmlAbstractBinding();
+    virtual ~QQmlAbstractBinding();
     void clear();
 
-    // Called by QQmlPropertyPrivate to "move" a binding to a different property.
-    // This is only used for alias properties. The default implementation qFatal()'s
-    // to ensure that the method is never called for binding types that don't support it.
-    void retargetBinding(QObject *o, int i) { vtable()->retargetBinding(this, o, i); }
-
 private:
-    Pointer weakPointer();
-
     friend class QQmlData;
-    friend class QQmlComponentPrivate;
     friend class QQmlValueTypeProxyBinding;
-    friend class QQmlPropertyPrivate;
-    friend class QtSharedPointer::ExternalRefCount<QQmlAbstractBinding>;
-    friend class QV4Bindings;
     friend class QQmlObjectCreator;
 
+    Pointer weakPointer();
+
     typedef QSharedPointer<QQmlAbstractBinding> SharedPointer;
     // To save memory, we also store the rarely used weakPointer() instance in here
     // We also use the flag bits:
@@ -154,7 +110,6 @@ private:
     inline void setAddedToObject(bool v);
     inline bool isAddedToObject() const;
 
-    inline QQmlAbstractBinding *nextBinding() const;
     inline void setNextBinding(QQmlAbstractBinding *);
 
     // Pointer to the next binding in the linked list of bindings.
@@ -166,9 +121,6 @@ private:
     // This saves a compiler-generated pointer to a compiler-generated vTable, and thus reduces
     // the binding object size by sizeof(void*).
     qintptr m_nextBindingPtr;
-
-    static VTable *vTables[];
-    inline const VTable *vtable() const { return vTables[bindingType()]; }
 };
 
 QQmlAbstractBinding::Pointer
@@ -202,18 +154,6 @@ QQmlAbstractBinding::BindingType QQmlAbstractBinding::bindingType() const
     return (BindingType)(m_nextBindingPtr & 0x3);
 }
 
-template<typename T>
-void QQmlAbstractBinding::default_destroy(QQmlAbstractBinding *This, DestroyMode mode)
-{
-    // Assume the binding disconnects itself in the destructor, which for example QQmlBinding
-    // does in the destructor of its base class, QQmlJavaScriptExpression
-    Q_UNUSED(mode);
-
-    This->removeFromObject();
-    This->clear();
-    delete static_cast<T *>(This);
-}
-
 QT_END_NAMESPACE
 
 #endif // QQMLABSTRACTBINDING_P_H