Extend the ReturnedValue mechanism to pointers to Managed objects

Add a Returned<T> that we can return instead of raw pointers
to Managed objects.

Start using the Returned<T> for a few methods.

Also clean up all our classes to use the Q_MANAGED macro instead
of manually defining their vtable.

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

1 files changed, 3 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h
index dec2f25c01..7862a602bd 100644
--- a/src/qml/jsruntime/qv4argumentsobject_p.h
+++ b/src/qml/jsruntime/qv4argumentsobject_p.h
@@ -50,32 +50,29 @@ namespace QV4 {
 
 struct ArgumentsGetterFunction: FunctionObject
 {
+    Q_MANAGED
     uint index;
 
     ArgumentsGetterFunction(ExecutionContext *scope, uint index)
         : FunctionObject(scope), index(index) { vtbl = &static_vtbl; }
 
     static ReturnedValue call(Managed *that, CallData *d);
-
-protected:
-    static const ManagedVTable static_vtbl;
 };
 
 struct ArgumentsSetterFunction: FunctionObject
 {
+    Q_MANAGED
     uint index;
 
     ArgumentsSetterFunction(ExecutionContext *scope, uint index)
         : FunctionObject(scope), index(index) { vtbl = &static_vtbl; }
 
     static ReturnedValue call(Managed *that, CallData *callData);
-
-protected:
-    static const ManagedVTable static_vtbl;
 };
 
 
 struct ArgumentsObject: Object {
+    Q_MANAGED
     CallContext *context;
     QVector<Value> mappedArguments;
     ArgumentsObject(CallContext *context);
@@ -90,7 +87,6 @@ struct ArgumentsObject: Object {
 
     static void markObjects(Managed *that);
 protected:
-    static const ManagedVTable static_vtbl;
     static void destroy(Managed *);
 };