Simplify ObjectIterator::next

Use PropertyKey instead of two out pointers

Change-Id: I4f57bcb36fd412f19f0ed116042f7b094b5785dc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 45d9a1219d..dbbd59abc9 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -317,25 +317,20 @@ ReturnedValue ObjectPrototype::method_defineProperties(const FunctionObject *b,
     ScopedValue val(scope);
 
     ObjectIterator it(scope, o, ObjectIterator::EnumerableOnly);
-    ScopedStringOrSymbol name(scope);
     ScopedProperty pd(scope);
     ScopedProperty n(scope);
+    ScopedPropertyKey key(scope);
     while (1) {
-        uint index;
         PropertyAttributes attrs;
-        it.next(name.getRef(), &index, pd, &attrs);
-        if (attrs.isEmpty())
+        key = it.next(pd, &attrs);
+        if (!key->isValid())
             break;
         PropertyAttributes nattrs;
         val = o->getValue(pd->value, attrs);
         toPropertyDescriptor(scope.engine, val, n, &nattrs);
         if (scope.engine->hasException)
         return QV4::Encode::undefined();
-        bool ok;
-        if (name)
-            ok = O->defineOwnProperty(name->toPropertyKey(), n, nattrs);
-        else
-            ok = O->defineOwnProperty(PropertyKey::fromArrayIndex(index), n, nattrs);
+        bool ok = O->defineOwnProperty(key, n, nattrs);
         if (!ok)
             THROW_TYPE_ERROR();
     }