From ec8f1f68d623ae68cc7d79e19067884532e3db6f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 1 Nov 2014 23:04:20 +0100 Subject: 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 --- src/qml/jsruntime/qv4regexp_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4regexp_p.h') 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; }; -- cgit v1.2.3