Move Managed::type and some flags into the vtable

Move the type flag into the vtable to free up these
bits in the Managed class, and not have to set them
at object construction time.

As we often need to know whether a Managed object is a
Object, FunctionObject or String, add some bitflags to test
for these to the vtable.

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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h
index 3bcbdeadbf..b37b28b078 100644
--- a/src/qml/jsruntime/qv4jsonobject_p.h
+++ b/src/qml/jsruntime/qv4jsonobject_p.h
@@ -51,10 +51,12 @@ QT_BEGIN_NAMESPACE
 namespace QV4 {
 
 struct JsonObject : Object {
+    Q_MANAGED_TYPE(JsonObject)
+    Q_MANAGED
 private:
     typedef QSet<QV4::Object *> V4ObjectSet;
 public:
-    JsonObject(ExecutionEngine *engine);
+    JsonObject(InternalClass *ic);
 
     static ReturnedValue method_parse(CallContext *ctx);
     static ReturnedValue method_stringify(CallContext *ctx);