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, 14 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index df25bab64a..9ea1fe9f80 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -61,10 +61,22 @@ inline int qYouForgotTheQ_MANAGED_Macro(T, T) { return 0; }
 template <typename T1, typename T2>
 inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {}
 
+template <typename T>
+struct Returned : private T
+{
+    static Returned<T> *create(T *t) { return static_cast<Returned<T> *>(t); }
+    T *getPointer() { return this; }
+    template<typename X>
+    static T *getPointer(Returned<X> *x) { return x->getPointer(); }
+};
+
 #define Q_MANAGED \
     public: \
         Q_MANAGED_CHECK \
-        static const QV4::ManagedVTable static_vtbl;
+        static const QV4::ManagedVTable static_vtbl; \
+        template <typename T> \
+        QV4::Returned<T> *asReturned() { return QV4::Returned<T>::create(this); } \
+
 
 struct GCDeletable
 {
@@ -162,6 +174,7 @@ const QV4::ManagedVTable classname::static_vtbl =    \
 
 struct Q_QML_EXPORT Managed
 {
+    Q_MANAGED
 private:
     void *operator new(size_t);
     Managed(const Managed &other);
@@ -319,9 +332,6 @@ public:
     };
 
 protected:
-
-    static const ManagedVTable static_vtbl;
-
     const ManagedVTable *vtbl;
 public:
     InternalClass *internalClass;