Begin moving the data out of Managed objects

We need to move the Data objects out of the Managed
objects, to avoid lots of trouble because inner classes
can't be forward declared in C++.

Instead move them all into a Heap namespace.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
index 7aad1a32f2..2ce39e812c 100644
--- a/src/qml/jsruntime/qv4regexp_p.h
+++ b/src/qml/jsruntime/qv4regexp_p.h
@@ -58,7 +58,7 @@ struct RegExpCacheKey;
 
 struct RegExp : public Managed
 {
-    struct Data : Managed::Data {
+    struct Data : Heap::Base {
         Data(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline);
         ~Data();
         QString pattern;
@@ -94,7 +94,7 @@ struct RegExp : public Managed
     int captureCount() const { return subPatternCount() + 1; }
 
     static void destroy(Managed *that);
-    static void markObjects(HeapObject *that, QV4::ExecutionEngine *e);
+    static void markObjects(Heap::Base *that, QV4::ExecutionEngine *e);
 
     friend class RegExpCache;
 };