aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4regexp.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-11-11 17:27:49 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-14 13:00:51 +0100
commit353402344d0bbf20bc0003324ab6e8d7f67ee90d (patch)
tree2ca98c94c37ed26cd9b94c03a92913f0bafac840 /src/qml/jsruntime/qv4regexp.cpp
parentafbf1f74af678af0eda76035133406aa8883408a (diff)
Replaced more usages of Returned<T> with Heap::T*
Change-Id: I451128ee71610bfeb71139c28da89a00a8209ec6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexp.cpp')
-rw-r--r--src/qml/jsruntime/qv4regexp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 36d3c707eb..631003cbe1 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -63,14 +63,14 @@ uint RegExp::match(const QString &string, int start, uint *matchOffsets)
return JSC::Yarr::interpret(byteCode().get(), s.characters16(), string.length(), start, matchOffsets);
}
-Returned<RegExp> *RegExp::create(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline)
+Heap::RegExp *RegExp::create(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline)
{
RegExpCacheKey key(pattern, ignoreCase, multiline);
RegExpCache *cache = engine->regExpCache;
if (cache) {
if (RegExp *result = cache->value(key))
- return Returned<RegExp>::create(result);
+ return result->d();
}
Scope scope(engine);
@@ -82,7 +82,7 @@ Returned<RegExp> *RegExp::create(ExecutionEngine* engine, const QString& pattern
result->d()->cache = cache;
cache->insert(key, result);
- return result.asReturned();
+ return result->d();
}
Heap::RegExp::RegExp(ExecutionEngine* engine, const QString &pattern, bool ignoreCase, bool multiline)