Remove dependency from qv4heap_p.h onto qv4internalclass_p.h

This is required to be able to turn the internal class into
something that lives on the GC heap.

Change-Id: Ie4318588d420743b1e1ab1cd596a1c9d153eb793
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index a5ee6b5373..42c0370138 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -56,6 +56,7 @@
 #include <QtCore/QString>
 #include "qv4global_p.h"
 #include <private/qv4heap_p.h>
+#include <private/qv4internalclass_p.h>
 
 #include <private/qnumeric_p.h>
 
@@ -428,11 +429,11 @@ public:
         if (!isManaged())
             return nullptr;
 
-        Q_ASSERT(m()->vtable());
+        Q_ASSERT(m()->internalClass->vtable);
 #if !defined(QT_NO_QOBJECT_CHECK)
         static_cast<const T *>(this)->qt_check_for_QMANAGED_macro(static_cast<const T *>(this));
 #endif
-        const VTable *vt = m()->vtable();
+        const VTable *vt = m()->internalClass->vtable;
         while (vt) {
             if (vt == T::staticVTable())
                 return static_cast<const T *>(this);
@@ -500,18 +501,18 @@ inline void Value::mark(MarkStack *markStack)
 inline bool Value::isString() const
 {
     Heap::Base *b = heapObject();
-    return b && b->vtable()->isString;
+    return b && b->internalClass->vtable->isString;
 }
 inline bool Value::isObject() const
 {
     Heap::Base *b = heapObject();
-    return b && b->vtable()->isObject;
+    return b && b->internalClass->vtable->isObject;
 }
 
 inline bool Value::isFunctionObject() const
 {
     Heap::Base *b = heapObject();
-    return b && b->vtable()->isFunctionObject;
+    return b && b->internalClass->vtable->isFunctionObject;
 }
 
 inline bool Value::isPrimitive() const