Remove the manual vtable from QQmlAbstractBinding

it's rather hard to maintain, and not really worth it. I believe
we can more easily save the one pointer in other places with
easier to maintain code.

Change-Id: Iaba2d62b82ebe58947fa35b0812b4c70f318007a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

7 files changed, 35 insertions, 151 deletions

diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index 6f8a67573c..7067a78437 100644
--- a/src/qml/debugger/qqmlenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -644,7 +644,7 @@ bool QQmlEngineDebugService::setBinding(int objectId,
                                                                                              filename, line, column);
                     QQmlPropertyPrivate::takeSignalExpression(property, qmlExpression);
                 } else if (property.isProperty()) {
-                    QQmlBinding *binding = new QQmlBinding(expression.toString(), object, QQmlContextData::get(context), filename, line, column);;
+                    QQmlBinding *binding = new QQmlBinding(expression.toString(), object, QQmlContextData::get(context), filename, line, column);
                     binding->setTarget(property);
                     QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::setBinding(property, binding);
                     if (oldBinding)
diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp
index 40c8f451b4..d0692987f8 100644
--- a/src/qml/qml/qqmlabstractbinding.cpp
+++ b/src/qml/qml/qqmlabstractbinding.cpp
@@ -39,14 +39,6 @@
 
 QT_BEGIN_NAMESPACE
 
-extern QQmlAbstractBinding::VTable QQmlBinding_vtable;
-extern QQmlAbstractBinding::VTable QQmlValueTypeProxyBinding_vtable;
-
-QQmlAbstractBinding::VTable *QQmlAbstractBinding::vTables[] = {
-    &QQmlBinding_vtable,
-    &QQmlValueTypeProxyBinding_vtable
-};
-
 QQmlAbstractBinding::QQmlAbstractBinding(BindingType bt)
     : m_nextBindingPtr(bt)
 {
@@ -199,14 +191,18 @@ void QQmlAbstractBinding::clear()
     }
 }
 
-void QQmlAbstractBinding::default_retargetBinding(QQmlAbstractBinding *, QObject *, int)
+void QQmlAbstractBinding::retargetBinding(QObject *, int)
 {
     qFatal("QQmlAbstractBinding::retargetBinding() called on illegal binding.");
 }
 
-QString QQmlAbstractBinding::default_expression(const QQmlAbstractBinding *)
+QString QQmlAbstractBinding::expression() const
 {
     return QLatin1String("<Unknown>");
 }
 
+void QQmlAbstractBinding::update(QQmlPropertyPrivate::WriteFlags)
+{
+}
+
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h
index eb4431c6b1..b37ea26088 100644
--- a/src/qml/qml/qqmlabstractbinding_p.h
+++ b/src/qml/qml/qqmlabstractbinding_p.h
@@ -57,40 +57,30 @@ class QQmlObjectCreator;
 class Q_QML_PRIVATE_EXPORT QQmlAbstractBinding
 {
 public:
-    struct VTable {
-        void (*destroy)(QQmlAbstractBinding *);
-        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;
 
-    void destroy()
-    { vtable()->destroy(this); }
+    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 propertyIndex() 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 *object() 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;
+    virtual void update(QQmlPropertyPrivate::WriteFlags = QQmlPropertyPrivate::DontRemoveBinding);
 
     void addToObject();
     void removeFromObject();
@@ -98,21 +88,16 @@ 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 *);
-    static QString default_expression(const QQmlAbstractBinding *);
-    static void default_retargetBinding(QQmlAbstractBinding *, QObject *, int);
 
 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); }
+    virtual void retargetBinding(QObject *, int);
 
 private:
     Pointer weakPointer();
@@ -146,9 +131,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
@@ -182,14 +164,6 @@ QQmlAbstractBinding::BindingType QQmlAbstractBinding::bindingType() const
     return (BindingType)(m_nextBindingPtr & 0x3);
 }
 
-template<typename T>
-void QQmlAbstractBinding::default_destroy(QQmlAbstractBinding *This)
-{
-    This->removeFromObject();
-    This->clear();
-    delete static_cast<T *>(This);
-}
-
 QT_END_NAMESPACE
 
 #endif // QQMLABSTRACTBINDING_P_H
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 558fbaf713..2a996f44c0 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -49,17 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// Used in qqmlabstractbinding.cpp
-QQmlAbstractBinding::VTable QQmlBinding_vtable = {
-    QQmlAbstractBinding::default_destroy<QQmlBinding>,
-    QQmlBinding::expression,
-    QQmlBinding::propertyIndex,
-    QQmlBinding::object,
-    QQmlBinding::setEnabled,
-    QQmlBinding::update,
-    QQmlBinding::retargetBinding
-};
-
 QQmlBinding::Identifier QQmlBinding::Invalid = -1;
 
 QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContext *ctxt)
@@ -272,36 +261,6 @@ void QQmlBinding::refresh()
     update();
 }
 
-QString QQmlBinding::expression(const QQmlAbstractBinding *This)
-{
-    return static_cast<const QQmlBinding *>(This)->expression();
-}
-
-int QQmlBinding::propertyIndex(const QQmlAbstractBinding *This)
-{
-    return static_cast<const QQmlBinding *>(This)->propertyIndex();
-}
-
-QObject *QQmlBinding::object(const QQmlAbstractBinding *This)
-{
-    return static_cast<const QQmlBinding *>(This)->object();
-}
-
-void QQmlBinding::setEnabled(QQmlAbstractBinding *This, bool e, QQmlPropertyPrivate::WriteFlags f)
-{
-    static_cast<QQmlBinding *>(This)->setEnabled(e, f);
-}
-
-void QQmlBinding::update(QQmlAbstractBinding *This , QQmlPropertyPrivate::WriteFlags f)
-{
-    static_cast<QQmlBinding *>(This)->update(f);
-}
-
-void QQmlBinding::retargetBinding(QQmlAbstractBinding *This, QObject *o, int i)
-{
-    static_cast<QQmlBinding *>(This)->retargetBinding(o, i);
-}
-
 void QQmlBinding::setEnabled(bool e, QQmlPropertyPrivate::WriteFlags flags)
 {
     setEnabledFlag(e);
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index 65adcae2c6..ecd809ff27 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -79,25 +79,16 @@ public:
 
     void setNotifyOnValueChanged(bool);
 
-    // Inherited from  QQmlJavaScriptExpression
+    // Inherited from QQmlJavaScriptExpression
     virtual void refresh();
 
-    // "Inherited" from  QQmlAbstractBinding
-    static QString expression(const QQmlAbstractBinding *);
-    static int propertyIndex(const QQmlAbstractBinding *);
-    static QObject *object(const QQmlAbstractBinding *);
-    static void setEnabled(QQmlAbstractBinding *, bool, QQmlPropertyPrivate::WriteFlags);
-    static void update(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags);
-    static void retargetBinding(QQmlAbstractBinding *, QObject *, int);
-
-    void setEnabled(bool, QQmlPropertyPrivate::WriteFlags flags);
-    void update(QQmlPropertyPrivate::WriteFlags flags);
-    void update() { update(QQmlPropertyPrivate::DontRemoveBinding); }
-
-    QString expression() const;
-    QObject *object() const;
-    int propertyIndex() const;
-    void retargetBinding(QObject *, int);
+    // Inherited from QQmlAbstractBinding
+    virtual void setEnabled(bool, QQmlPropertyPrivate::WriteFlags flags = QQmlPropertyPrivate::DontRemoveBinding);
+    virtual void retargetBinding(QObject *, int);
+    virtual QString expression() const;
+    virtual QObject *object() const;
+    virtual int propertyIndex() const;
+    virtual void update(QQmlPropertyPrivate::WriteFlags flags = QQmlPropertyPrivate::DontRemoveBinding);
 
     typedef int Identifier;
     static Identifier Invalid;
diff --git a/src/qml/qml/qqmlvaluetypeproxybinding.cpp b/src/qml/qml/qqmlvaluetypeproxybinding.cpp
index cfc9b196d2..b063868fff 100644
--- a/src/qml/qml/qqmlvaluetypeproxybinding.cpp
+++ b/src/qml/qml/qqmlvaluetypeproxybinding.cpp
@@ -35,17 +35,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// Used in qqmlabstractbinding.cpp
-QQmlAbstractBinding::VTable QQmlValueTypeProxyBinding_vtable = {
-    QQmlAbstractBinding::default_destroy<QQmlValueTypeProxyBinding>,
-    QQmlAbstractBinding::default_expression,
-    QQmlValueTypeProxyBinding::propertyIndex,
-    QQmlValueTypeProxyBinding::object,
-    QQmlValueTypeProxyBinding::setEnabled,
-    QQmlValueTypeProxyBinding::update,
-    QQmlAbstractBinding::default_retargetBinding
-};
-
 QQmlValueTypeProxyBinding::QQmlValueTypeProxyBinding(QObject *o, int index)
 : QQmlAbstractBinding(ValueTypeProxy), m_object(o), m_index(index), m_bindings(0)
 {
@@ -64,17 +53,12 @@ QQmlValueTypeProxyBinding::~QQmlValueTypeProxyBinding()
     }
 }
 
-void QQmlValueTypeProxyBinding::setEnabled(QQmlAbstractBinding *_This,
-                                           bool e, QQmlPropertyPrivate::WriteFlags flags)
+void QQmlValueTypeProxyBinding::setEnabled(bool e, QQmlPropertyPrivate::WriteFlags flags)
 {
-    QQmlValueTypeProxyBinding *This = static_cast<QQmlValueTypeProxyBinding *>(_This);
-
     if (e) {
-        QQmlAbstractBinding *bindings = This->m_bindings;
-        This->recursiveEnable(bindings, flags);
+        recursiveEnable(m_bindings, flags);
     } else {
-        QQmlAbstractBinding *bindings = This->m_bindings;
-        This->recursiveDisable(bindings);
+        recursiveDisable(m_bindings);
     }
 }
 
@@ -100,10 +84,6 @@ void QQmlValueTypeProxyBinding::recursiveDisable(QQmlAbstractBinding *b)
         b->setEnabled(false, 0);
 }
 
-void QQmlValueTypeProxyBinding::update(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags)
-{
-}
-
 QQmlAbstractBinding *QQmlValueTypeProxyBinding::binding(int propertyIndex)
 {
     QQmlAbstractBinding *binding = m_bindings;
@@ -143,16 +123,6 @@ void QQmlValueTypeProxyBinding::removeBindings(quint32 mask)
     }
 }
 
-int QQmlValueTypeProxyBinding::propertyIndex(const QQmlAbstractBinding *This)
-{
-    return static_cast<const QQmlValueTypeProxyBinding *>(This)->m_index;
-}
-
-QObject *QQmlValueTypeProxyBinding::object(const QQmlAbstractBinding *This)
-{
-    return static_cast<const QQmlValueTypeProxyBinding *>(This)->m_object;
-}
-
 int QQmlValueTypeProxyBinding::propertyIndex() const
 {
     return m_index;
diff --git a/src/qml/qml/qqmlvaluetypeproxybinding_p.h b/src/qml/qml/qqmlvaluetypeproxybinding_p.h
index 873fbb4af1..5f5194d8cc 100644
--- a/src/qml/qml/qqmlvaluetypeproxybinding_p.h
+++ b/src/qml/qml/qqmlvaluetypeproxybinding_p.h
@@ -54,25 +54,19 @@ class QQmlValueTypeProxyBinding : public QQmlAbstractBinding
 public:
     QQmlValueTypeProxyBinding(QObject *o, int coreIndex);
 
-    int propertyIndex() const;
-    QObject *object() const;
-
     QQmlAbstractBinding *binding(int propertyIndex);
-
     void removeBindings(quint32 mask);
 
-    // "Inherited" from QQmlAbstractBinding
-    static void setEnabled(QQmlAbstractBinding *, bool, QQmlPropertyPrivate::WriteFlags);
-    static void update(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags);
-    static int propertyIndex(const QQmlAbstractBinding *);
-    static QObject *object(const QQmlAbstractBinding *);
+    virtual void setEnabled(bool, QQmlPropertyPrivate::WriteFlags);
+    virtual int propertyIndex() const;
+    virtual QObject *object() const;
 
 protected:
     ~QQmlValueTypeProxyBinding();
 
 private:
-    void recursiveEnable(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags);
-    void recursiveDisable(QQmlAbstractBinding *);
+    static void recursiveEnable(QQmlAbstractBinding *, QQmlPropertyPrivate::WriteFlags);
+    static void recursiveDisable(QQmlAbstractBinding *);
 
     friend class QQmlAbstractBinding;
     QObject *m_object;