1 files changed, 11 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp
index f36ee554a7..3901101855 100644
--- a/src/qml/jsruntime/qv4objectiterator.cpp
+++ b/src/qml/jsruntime/qv4objectiterator.cpp
@@ -35,6 +35,7 @@
 #include "qv4stringobject_p.h"
 #include "qv4identifier_p.h"
 #include "qv4argumentsobject_p.h"
+#include "qv4string_p.h"
 
 using namespace QV4;
 
@@ -83,7 +84,7 @@ void ObjectIterator::next(Heap::String **name, uint *index, Property *pd, Proper
     *name = 0;
     *index = UINT_MAX;
 
-    if (!object->asObject()) {
+    if (!object->as<Object>()) {
         *attrs = PropertyAttributes();
         return;
     }
@@ -92,19 +93,19 @@ void ObjectIterator::next(Heap::String **name, uint *index, Property *pd, Proper
     ScopedString n(scope);
 
     while (1) {
-        if (!current->asObject())
+        if (!current->as<Object>())
             break;
 
         while (1) {
-            current->asObject()->advanceIterator(this, name, index, pd, attrs);
+            current->as<Object>()->advanceIterator(this, name, index, pd, attrs);
             if (attrs->isEmpty())
                 break;
             // check the property is not already defined earlier in the proto chain
             if (current->heapObject() != object->heapObject()) {
-                o = object->asObject();
+                o = object->as<Object>();
                 n = *name;
                 bool shadowed = false;
-                while (o->asObject()->d() != current->heapObject()) {
+                while (o->d() != current->heapObject()) {
                     if ((!!n && o->hasOwnProperty(n)) ||
                         (*index != UINT_MAX && o->hasOwnProperty(*index))) {
                         shadowed = true;
@@ -131,7 +132,7 @@ void ObjectIterator::next(Heap::String **name, uint *index, Property *pd, Proper
 
 ReturnedValue ObjectIterator::nextPropertyName(Value *value)
 {
-    if (!object->asObject())
+    if (!object->as<Object>())
         return Encode::null();
 
     PropertyAttributes attrs;
@@ -147,13 +148,13 @@ ReturnedValue ObjectIterator::nextPropertyName(Value *value)
 
     if (!!name)
         return name->asReturnedValue();
-    assert(index < UINT_MAX);
+    Q_ASSERT(index < UINT_MAX);
     return Encode(index);
 }
 
 ReturnedValue ObjectIterator::nextPropertyNameAsString(Value *value)
 {
-    if (!object->asObject())
+    if (!object->as<Object>())
         return Encode::null();
 
     PropertyAttributes attrs;
@@ -169,13 +170,13 @@ ReturnedValue ObjectIterator::nextPropertyNameAsString(Value *value)
 
     if (!!name)
         return name->asReturnedValue();
-    assert(index < UINT_MAX);
+    Q_ASSERT(index < UINT_MAX);
     return Encode(engine->newString(QString::number(index)));
 }
 
 ReturnedValue ObjectIterator::nextPropertyNameAsString()
 {
-    if (!object->asObject())
+    if (!object->as<Object>())
         return Encode::null();
 
     PropertyAttributes attrs;