diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-26 12:04:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:46 +0200 |
| commit | d2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb (patch) | |
| tree | 1fc21beff4add85e68a61b7c88b5d5f928bec6e8 /src/qml/jsruntime/qv4regexpobject.cpp | |
| parent | 18d4794e3f614eec8594f6636d569af8bc112618 (diff) | |
| download | qtdeclarative-d2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb.tar.gz | |
Remove Value::fromString()
replaced with call to the GC safe ExceutionEngine::newString()
method.
Change-Id: I7258296e75ca724ff42b94a0d147bc33a05f8f68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index b3dec63d53..126188fcb7 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -332,7 +332,7 @@ ReturnedValue RegExpPrototype::method_exec(SimpleCallContext *ctx) for (int i = 0; i < len; ++i) { int start = matchOffsets[i * 2]; int end = matchOffsets[i * 2 + 1]; - array->arrayData[i].value = (start != -1 && end != -1) ? Value::fromString(ctx, s.mid(start, end - start)) : Primitive::undefinedValue(); + array->arrayData[i].value = (start != -1 && end != -1) ? ctx->engine->newString(s.mid(start, end - start))->asReturnedValue() : Encode::undefined(); array->arrayDataLen = i + 1; } array->setArrayLengthUnchecked(len); @@ -360,7 +360,7 @@ ReturnedValue RegExpPrototype::method_toString(SimpleCallContext *ctx) if (!r) ctx->throwTypeError(); - return Value::fromString(ctx, r->toString()).asReturnedValue(); + return ctx->engine->newString(r->toString())->asReturnedValue(); } ReturnedValue RegExpPrototype::method_compile(SimpleCallContext *ctx) |