Convert the QML Binding wrapper to new data storage

Change-Id: I715184fe339238a7881a4c64af8c976b81362724
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index b2c0efc75f..5427ebb704 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -56,7 +56,16 @@ namespace QV4 {
 struct ExecutionContext;
 
 struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
-    V4_OBJECT
+    struct Data : FunctionObject::Data {
+        Object *qml;
+        CallContext *qmlContext;
+    };
+    struct {
+        Object *qml;
+        CallContext *qmlContext;
+    } __data;
+
+    V4_OBJECT_NEW
 
     QmlBindingWrapper(ExecutionContext *scope, Function *f, ObjectRef qml);
     // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
@@ -65,13 +74,12 @@ struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
     static ReturnedValue call(Managed *that, CallData *);
     static void markObjects(Managed *m, ExecutionEngine *e);
 
-    CallContext *context() const { return qmlContext; }
+    CallContext *context() const { return d()->qmlContext; }
 
-    static Returned<FunctionObject> *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction, const QList<QByteArray> &signalParameters = QList<QByteArray>(), QString *error = 0);
+    static Returned<FunctionObject> *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction,
+                                                                  const QList<QByteArray> &signalParameters = QList<QByteArray>(), QString *error = 0);
 
 private:
-    Object *qml;
-    CallContext *qmlContext;
 };
 
 struct Q_QML_EXPORT Script {