diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-19 12:55:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | a9bdc91cefabb3729d0240fce4c01a669be09dbf (patch) | |
| tree | 6f2a2639164ec1a530ccc33bc96bece299df0dbf /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 49369e62b50a4f903a5b2fcbfbfbc1f6f2838e8e (diff) | |
Fix some more methods to take ValueRef's
Change-Id: Ia0e30ba98c16e51c9992027c7e5f78d4def8697a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 5e2a7db9a1..1ff64830ae 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -164,7 +164,7 @@ ReturnedValue ArrayPrototype::method_concat(SimpleCallContext *ctx) if (instance) { result->copyArrayData(instance.getPointer()); } else { - result->arraySet(0, thisObject.asValue()); + result->arraySet(0, thisObject); } for (uint i = 0; i < ctx->argumentCount; ++i) { @@ -284,17 +284,15 @@ ReturnedValue ArrayPrototype::method_push(SimpleCallContext *ctx) if (!instance->protoHasArray() && instance->arrayDataLen <= len) { for (uint i = 0; i < ctx->argumentCount; ++i) { - Value v = ctx->arguments[i]; - if (!instance->sparseArray) { if (len >= instance->arrayAlloc) instance->arrayReserve(len + 1); - instance->arrayData[len].value = v; + instance->arrayData[len].value = ctx->arguments[i]; if (instance->arrayAttributes) instance->arrayAttributes[len] = Attr_Data; instance->arrayDataLen = len + 1; } else { - uint i = instance->allocArrayValue(v); + uint i = instance->allocArrayValue(ctx->arguments[i]); instance->sparseArray->push_back(i, len); } ++len; |