Split ManagedVTable into two classes

Keep the basic methods in ManagedVTable, but have
the Object related stuff in an ObjectVTable class.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/tools/qmljs/main.cpp b/tools/qmljs/main.cpp
index 9c10851b21..c5c94773b9 100644
--- a/tools/qmljs/main.cpp
+++ b/tools/qmljs/main.cpp
@@ -71,8 +71,9 @@ using namespace QV4;
 
 struct Print: FunctionObject
 {
+    V4_OBJECT
     Print(ExecutionContext *scope): FunctionObject(scope, QStringLiteral("print")) {
-        setVTable(&static_vtbl);
+        setVTable(staticVTable());
     }
 
     static ReturnedValue call(Managed *, CallData *callData)
@@ -86,29 +87,26 @@ struct Print: FunctionObject
         std::cout << std::endl;
         return Encode::undefined();
     }
-
-    static const ManagedVTable static_vtbl;
 };
 
-DEFINE_MANAGED_VTABLE(Print);
+DEFINE_OBJECT_VTABLE(Print);
 
 struct GC: public FunctionObject
 {
+    V4_OBJECT
     GC(ExecutionContext* scope)
         : FunctionObject(scope, QStringLiteral("gc"))
     {
-        setVTable(&static_vtbl);
+        setVTable(staticVTable());
     }
     static ReturnedValue call(Managed *m, CallData *)
     {
         m->engine()->memoryManager->runGC();
         return Encode::undefined();
     }
-
-    static const ManagedVTable static_vtbl;
 };
 
-DEFINE_MANAGED_VTABLE(GC);
+DEFINE_OBJECT_VTABLE(GC);
 
 } // builtins