From da2396478f04aa66d521e53ff24488e72c87d895 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 1 Nov 2014 23:29:21 +0100 Subject: Cleanup RegExp Move it's Data into the Heap namespace. Change-Id: I4ed6ea481376ae1d0c1fb08b56feee4764083231 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4regexp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/jsruntime/qv4regexp.cpp') diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index eab364c418..36d3c707eb 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -85,13 +85,13 @@ Returned *RegExp::create(ExecutionEngine* engine, const QString& pattern return result.asReturned(); } -RegExp::Data::Data(ExecutionEngine* engine, const QString &pattern, bool ignoreCase, bool multiline) - : Heap::Base(engine->regExpValueClass) +Heap::RegExp::RegExp(ExecutionEngine* engine, const QString &pattern, bool ignoreCase, bool multiline) + : Base(engine->regExpValueClass) , pattern(pattern) , ignoreCase(ignoreCase) , multiLine(multiline) { - setVTable(staticVTable()); + setVTable(QV4::RegExp::staticVTable()); const char* error = 0; JSC::Yarr::YarrPattern yarrPattern(WTF::String(pattern), ignoreCase, multiline, &error); if (error) @@ -106,7 +106,7 @@ RegExp::Data::Data(ExecutionEngine* engine, const QString &pattern, bool ignoreC #endif } -RegExp::Data::~Data() +Heap::RegExp::~RegExp() { if (cache) { RegExpCacheKey key(this); -- cgit v1.2.3