aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4regexpobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-15 21:28:01 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-23 12:30:35 +0100
commit3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (patch)
tree2bd9090f4bcf01e9c9e43c0d52fcbf80295ca6c0 /src/qml/jsruntime/qv4regexpobject.cpp
parent3f3652e43fc001df728ef00403b18d3202e2726a (diff)
Cleanups
Remove duplicated methods. Remove some mostly unused methods, and simplify some others. Change-Id: I605b249e54417bb32c3dfc8e22f2c8b6b684a1e1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4regexpobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index b9d22794bb..0736056838 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -385,7 +385,7 @@ ReturnedValue RegExpPrototype::method_exec(CallContext *ctx)
}
array->setArrayLengthUnchecked(len);
array->memberData()->data[Index_ArrayIndex] = Primitive::fromInt32(result);
- array->memberData()->data[Index_ArrayInput] = arg.asReturnedValue();
+ array->memberData()->data[Index_ArrayInput] = arg;
RegExpCtor::Data *dd = regExpCtor->d();
dd->lastMatch = array;
@@ -441,7 +441,7 @@ ReturnedValue RegExpPrototype::method_get_lastMatch_n(CallContext *ctx)
ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(index) : Encode::undefined());
if (result->isUndefined())
return ctx->d()->engine->newString()->asReturnedValue();
- return result.asReturnedValue();
+ return result->asReturnedValue();
}
ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
@@ -451,7 +451,7 @@ ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(lastMatch->getLength() - 1) : Encode::undefined());
if (result->isUndefined())
return ctx->d()->engine->newString()->asReturnedValue();
- return result.asReturnedValue();
+ return result->asReturnedValue();
}
ReturnedValue RegExpPrototype::method_get_input(CallContext *ctx)