1 files changed, 16 insertions, 105 deletions

diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 0fe5c7ee49..6f5564300f 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -35,7 +35,7 @@
 
 #include "qv4global_p.h"
 #include "qv4value_p.h"
-#include "qv4internalclass_p.h"
+#include <private/qv4heap_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,10 +65,10 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {}
         Q_MANAGED_CHECK \
         typedef QV4::Heap::DataClass Data; \
         typedef superClass SuperClass; \
-        static const QV4::ManagedVTable static_vtbl; \
-        static inline const QV4::ManagedVTable *staticVTable() { return &static_vtbl; } \
+        static const QV4::VTable static_vtbl; \
+        static inline const QV4::VTable *staticVTable() { return &static_vtbl; } \
         V4_MANAGED_SIZE_TEST \
-        QV4::Heap::DataClass *d() const { return static_cast<QV4::Heap::DataClass *>(m); }
+        QV4::Heap::DataClass *d() const { return static_cast<QV4::Heap::DataClass *>(m()); }
 
 #define Q_MANAGED_TYPE(type) \
     public: \
@@ -78,31 +78,6 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {}
     (classname::func == QV4::Managed::func ? 0 : classname::func)
 
 
-struct GCDeletable
-{
-    GCDeletable() : next(0), lastCall(false) {}
-    virtual ~GCDeletable() {}
-    GCDeletable *next;
-    bool lastCall;
-};
-
-struct ManagedVTable
-{
-    const ManagedVTable * const parent;
-    uint isExecutionContext : 1;
-    uint isString : 1;
-    uint isObject : 1;
-    uint isFunctionObject : 1;
-    uint isErrorObject : 1;
-    uint isArrayData : 1;
-    uint unused : 18;
-    uint type : 8;
-    const char *className;
-    void (*destroy)(Heap::Base *);
-    void (*markObjects)(Heap::Base *, ExecutionEngine *e);
-    bool (*isEqualTo)(Managed *m, Managed *other);
-};
-
 #define DEFINE_MANAGED_VTABLE_INT(classname, parentVTable) \
 {     \
     parentVTable, \
@@ -121,7 +96,7 @@ struct ManagedVTable
 }
 
 #define DEFINE_MANAGED_VTABLE(classname) \
-const QV4::ManagedVTable classname::static_vtbl = DEFINE_MANAGED_VTABLE_INT(classname, 0)
+const QV4::VTable classname::static_vtbl = DEFINE_MANAGED_VTABLE_INT(classname, 0)
 
 struct Q_QML_PRIVATE_EXPORT Managed : Value
 {
@@ -141,8 +116,6 @@ private:
 
 public:
 
-    inline void mark(QV4::ExecutionEngine *engine);
-
     enum Type {
         Type_Invalid,
         Type_String,
@@ -167,55 +140,15 @@ public:
     };
     Q_MANAGED_TYPE(Invalid)
 
-    template <typename T>
-    T *as() {
-        Q_ASSERT(d()->vtable);
-#if !defined(QT_NO_QOBJECT_CHECK)
-        static_cast<T *>(this)->qt_check_for_QMANAGED_macro(static_cast<T *>(this));
-#endif
-        const ManagedVTable *vt = d()->vtable;
-        while (vt) {
-            if (vt == T::staticVTable())
-                return static_cast<T *>(this);
-            vt = vt->parent;
-        }
-        return 0;
-    }
-    template <typename T>
-    const T *as() const {
-        Q_ASSERT(d()->vtable);
-#if !defined(QT_NO_QOBJECT_CHECK)
-        static_cast<T *>(this)->qt_check_for_QMANAGED_macro(static_cast<T *>(const_cast<Managed *>(this)));
-#endif
-        const ManagedVTable *vt = d()->vtable;
-        while (vt) {
-            if (vt == T::staticVTable())
-                return static_cast<T *>(this);
-            vt = vt->parent;
-        }
-        return 0;
-    }
-
-    String *asString() { return d()->vtable->isString ? reinterpret_cast<String *>(this) : 0; }
-    Object *asObject() { return d()->vtable->isObject ? reinterpret_cast<Object *>(this) : 0; }
-    ArrayObject *asArrayObject() { return d()->vtable->type == Type_ArrayObject ? reinterpret_cast<ArrayObject *>(this) : 0; }
-    FunctionObject *asFunctionObject() { return d()->vtable->isFunctionObject ? reinterpret_cast<FunctionObject *>(this) : 0; }
-    BooleanObject *asBooleanObject() { return d()->vtable->type == Type_BooleanObject ? reinterpret_cast<BooleanObject *>(this) : 0; }
-    NumberObject *asNumberObject() { return d()->vtable->type == Type_NumberObject ? reinterpret_cast<NumberObject *>(this) : 0; }
-    StringObject *asStringObject() { return d()->vtable->type == Type_StringObject ? reinterpret_cast<StringObject *>(this) : 0; }
-    DateObject *asDateObject() { return d()->vtable->type == Type_DateObject ? reinterpret_cast<DateObject *>(this) : 0; }
-    ErrorObject *asErrorObject() { return d()->vtable->isErrorObject ? reinterpret_cast<ErrorObject *>(this) : 0; }
-    ArgumentsObject *asArgumentsObject() { return d()->vtable->type == Type_ArgumentsObject ? reinterpret_cast<ArgumentsObject *>(this) : 0; }
-
-    bool isListType() const { return d()->vtable->type == Type_QmlSequence; }
-
-    bool isArrayObject() const { return d()->vtable->type == Type_ArrayObject; }
-    bool isStringObject() const { return d()->vtable->type == Type_StringObject; }
+    bool isListType() const { return d()->vtable()->type == Type_QmlSequence; }
+
+    bool isArrayObject() const { return d()->vtable()->type == Type_ArrayObject; }
+    bool isStringObject() const { return d()->vtable()->type == Type_StringObject; }
 
     QString className() const;
 
     bool isEqualTo(const Managed *other) const
-    { return d()->vtable->isEqualTo(const_cast<Managed *>(this), const_cast<Managed *>(other)); }
+    { return d()->vtable()->isEqualTo(const_cast<Managed *>(this), const_cast<Managed *>(other)); }
 
     static bool isEqualTo(Managed *m, Managed *other);
 
@@ -231,37 +164,15 @@ private:
 
 
 template<>
-inline Managed *value_cast(const Value &v) {
-    return v.asManaged();
+inline const Managed *Value::as() const {
+    if (isManaged())
+        return managed();
+    return 0;
 }
 
-template<typename T>
-inline T *managed_cast(Managed *m)
-{
-    return m ? m->as<T>() : 0;
-}
-
-template<>
-inline String *managed_cast(Managed *m)
-{
-    return m ? m->asString() : 0;
-}
 template<>
-inline Object *managed_cast(Managed *m)
-{
-    return m ? m->asObject() : 0;
-}
-template<>
-inline FunctionObject *managed_cast(Managed *m)
-{
-    return m ? m->asFunctionObject() : 0;
-}
-
-inline Value Value::fromManaged(Managed *m)
-{
-    if (!m)
-        return QV4::Primitive::undefinedValue();
-    return *m;
+inline const Object *Value::as() const {
+    return isManaged() && m() && m()->vtable()->isObject ? objectValue() : 0;
 }
 
 }