1 files changed, 20 insertions, 19 deletions

diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp
index 1ee4121f5c..a24953ae3f 100644
--- a/src/qml/jsapi/qjsvalueiterator.cpp
+++ b/src/qml/jsapi/qjsvalueiterator.cpp
@@ -52,9 +52,6 @@ QJSValueIteratorPrivate::QJSValueIteratorPrivate(const QJSValue &v)
     QV4::Scope scope(e);
     QV4::ScopedObject o(scope, QJSValuePrivate::getValue(&v));
     iterator.set(e, e->newForEachIteratorObject(o));
-
-    currentName = (QV4::String *)0;
-    nextName = (QV4::String *)0;
 }
 
 
@@ -102,8 +99,10 @@ QJSValueIterator::QJSValueIterator(const QJSValue& object)
     QV4::Scoped<QV4::ForEachIteratorObject> it(scope, d_ptr->iterator.value());
     it->d()->it.flags =  QV4::ObjectIterator::NoFlags;
     QV4::ScopedString nm(scope);
-    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &d_ptr->nextProperty, &d_ptr->nextAttributes);
-    d_ptr->nextName = nm;
+    QV4::Property nextProperty;
+    QV4::PropertyAttributes nextAttributes;
+    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &nextProperty, &nextAttributes);
+    d_ptr->nextName.set(v4, nm.asReturnedValue());
 }
 
 /*!
@@ -125,7 +124,7 @@ bool QJSValueIterator::hasNext() const
     QV4::Value *val = QJSValuePrivate::getValue(&d_ptr->value);
     if (!val || !val->isObject())
         return false;
-    return !!d_ptr->nextName || d_ptr->nextIndex != UINT_MAX;
+    return d_ptr->nextName.as<QV4::String>() || d_ptr->nextIndex != UINT_MAX;
 }
 
 /*!
@@ -143,8 +142,6 @@ bool QJSValueIterator::next()
         return false;
     d_ptr->currentName = d_ptr->nextName;
     d_ptr->currentIndex = d_ptr->nextIndex;
-    d_ptr->currentProperty.copy(&d_ptr->nextProperty, d_ptr->nextAttributes);
-    d_ptr->currentAttributes = d_ptr->nextAttributes;
 
     QV4::ExecutionEngine *v4 = d_ptr->iterator.engine();
     if (!v4)
@@ -152,9 +149,11 @@ bool QJSValueIterator::next()
     QV4::Scope scope(v4);
     QV4::Scoped<QV4::ForEachIteratorObject> it(scope, d_ptr->iterator.value());
     QV4::ScopedString nm(scope);
-    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &d_ptr->nextProperty, &d_ptr->nextAttributes);
-    d_ptr->nextName = nm;
-    return !!d_ptr->currentName || d_ptr->currentIndex != UINT_MAX;
+    QV4::Property nextProperty;
+    QV4::PropertyAttributes nextAttributes;
+    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &nextProperty, &nextAttributes);
+    d_ptr->nextName.set(v4, nm.asReturnedValue());
+    return d_ptr->currentName.as<QV4::String>() || d_ptr->currentIndex != UINT_MAX;
 }
 
 /*!
@@ -168,8 +167,8 @@ QString QJSValueIterator::name() const
     QV4::Value *val = QJSValuePrivate::getValue(&d_ptr->value);
     if (!val || !val->isObject())
         return QString();
-    if (!!d_ptr->currentName)
-        return d_ptr->currentName->toQString();
+    if (QV4::String *s = d_ptr->currentName.as<QV4::String>())
+        return s->toQString();
     if (d_ptr->currentIndex < UINT_MAX)
         return QString::number(d_ptr->currentIndex);
     return QString();
@@ -192,10 +191,10 @@ QJSValue QJSValueIterator::value() const
     if (!obj)
         return QJSValue();
 
-    if (!d_ptr->currentName && d_ptr->currentIndex == UINT_MAX)
+    if (!d_ptr->currentName.as<QV4::String>() && d_ptr->currentIndex == UINT_MAX)
         return QJSValue();
 
-    QV4::ScopedValue v(scope, obj->getValue(*obj, &d_ptr->currentProperty, d_ptr->currentAttributes));
+    QV4::ScopedValue v(scope, d_ptr->currentIndex == UINT_MAX ? obj->get(d_ptr->currentName.as<QV4::String>()) : obj->getIndexed(d_ptr->currentIndex));
     if (scope.hasException()) {
         engine->catchException();
         return QJSValue();
@@ -214,8 +213,8 @@ QJSValueIterator& QJSValueIterator::operator=(QJSValue& object)
     d_ptr->value = object;
     d_ptr->currentIndex = UINT_MAX;
     d_ptr->nextIndex = UINT_MAX;
-    d_ptr->currentName = (QV4::String *)0;
-    d_ptr->nextName = (QV4::String *)0;
+    d_ptr->currentName.clear();
+    d_ptr->nextName.clear();
     QV4::ExecutionEngine *v4 = d_ptr->iterator.engine();
     if (!v4) {
         d_ptr->iterator.clear();
@@ -228,8 +227,10 @@ QJSValueIterator& QJSValueIterator::operator=(QJSValue& object)
     QV4::Scoped<QV4::ForEachIteratorObject> it(scope, d_ptr->iterator.value());
     it->d()->it.flags =  QV4::ObjectIterator::NoFlags;
     QV4::ScopedString nm(scope);
-    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &d_ptr->nextProperty, &d_ptr->nextAttributes);
-    d_ptr->nextName = nm;
+    QV4::Property nextProperty;
+    QV4::PropertyAttributes nextAttributes;
+    it->d()->it.next(nm.getRef(), &d_ptr->nextIndex, &nextProperty, &nextAttributes);
+    d_ptr->nextName.set(v4, nm.asReturnedValue());
     return *this;
 }