Move more Data members over to the Heap namespace

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

1 files changed, 12 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 337354b38b..3379e204e1 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -71,15 +71,19 @@ struct ContextStateSaver {
     }
 };
 
+namespace Heap {
+struct QmlBindingWrapper : Heap::FunctionObject {
+    QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::Object *qml);
+    // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
+    QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Object *qml);
+    QV4::Object *qml;
+    QV4::CallContext *qmlContext;
+};
+
+}
+
 struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
-    struct Data : Heap::FunctionObject {
-        Data(ExecutionContext *scope, Function *f, QV4::Object *qml);
-        // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
-        Data(ExecutionContext *scope, QV4::Object *qml);
-        QV4::Object *qml;
-        CallContext *qmlContext;
-    };
-    V4_OBJECT(FunctionObject)
+    V4_OBJECT2(QmlBindingWrapper, FunctionObject)
 
     static ReturnedValue call(Managed *that, CallData *);
     static void markObjects(Heap::Base *m, ExecutionEngine *e);