1 files changed, 8 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index b5b421fa39..af1a2d1de0 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -175,7 +175,8 @@ static ScopedObject createObjectFromCtorOrArray(Scope &scope, ScopedFunctionObje
         // this isn't completely kosher. for instance:
         // Array.from.call(Object, []).constructor == Object
         // is expected by the tests, but naturally, we get Number.
-        ScopedValue argument(scope, useLen ? QV4::Encode(len) : Value::undefinedValue());
+        ScopedValue argument(scope, useLen ? Value::fromReturnedValue(QV4::Encode(len))
+                                           : Value::undefinedValue());
         a = ctor->callAsConstructor(argument, useLen ? 1 : 0);
     } else {
         a = scope.engine->newArrayObject(len);
@@ -219,7 +220,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
         // Item iteration supported, so let's go ahead and try use that.
         ScopedObject a(createObjectFromCtorOrArray(scope, thatCtor, false, 0));
         CHECK_EXCEPTION();
-        ScopedObject iterator(scope, Runtime::method_getIterator(scope.engine, itemsObject, true));
+        ScopedObject iterator(scope, Runtime::GetIterator::call(scope.engine, itemsObject, true));
         CHECK_EXCEPTION(); // symbol_iterator threw; whoops.
         if (!iterator) {
             return scope.engine->throwTypeError(); // symbol_iterator wasn't an object.
@@ -236,11 +237,11 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
             if (k > (static_cast<qint64>(1) << 53) - 1) {
                 ScopedValue falsey(scope, Encode(false));
                 ScopedValue error(scope, scope.engine->throwTypeError());
-                return Runtime::method_iteratorClose(scope.engine, iterator, falsey);
+                return Runtime::IteratorClose::call(scope.engine, iterator, falsey);
             }
 
             // Retrieve the next value. If the iteration ends, we're done here.
-            done = Value::fromReturnedValue(Runtime::method_iteratorNext(scope.engine, iterator, nextValue));
+            done = Value::fromReturnedValue(Runtime::IteratorNext::call(scope.engine, iterator, nextValue));
             CHECK_EXCEPTION();
             if (done->toBoolean()) {
                 if (ArrayObject *ao = a->as<ArrayObject>()) {
@@ -257,7 +258,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
                 mapArguments[1] = Value::fromDouble(k);
                 mappedValue = mapfn->call(thisArg, mapArguments, 2);
                 if (scope.engine->hasException)
-                    return Runtime::method_iteratorClose(scope.engine, iterator, Value::fromBoolean(false));
+                    return Runtime::IteratorClose::call(scope.engine, iterator, Value::fromBoolean(false));
             } else {
                 mappedValue = *nextValue;
             }
@@ -271,7 +272,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V
 
             if (scope.engine->hasException) {
                 ScopedValue falsey(scope, Encode(false));
-                return Runtime::method_iteratorClose(scope.engine, iterator, falsey);
+                return Runtime::IteratorClose::call(scope.engine, iterator, falsey);
             }
 
             k++;
@@ -387,7 +388,7 @@ ReturnedValue ArrayPrototype::method_toLocaleString(const FunctionObject *b, con
         v = instance->get(k);
         if (v->isNullOrUndefined())
             continue;
-        v = Runtime::method_callElement(scope.engine, v, *scope.engine->id_toLocaleString(), nullptr, 0);
+        v = Runtime::CallElement::call(scope.engine, v, *scope.engine->id_toLocaleString(), nullptr, 0);
         s = v->toString(scope.engine);
         if (scope.hasException())
             return Encode::undefined();