Cleanup: Get rid of String and Object pointers in Value

Change-Id: I4f007d0437c9a5cc79fe35d960d40557366d46fe
Reviewed-by: Lars Knoll <[email protected]>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp
index f9038472df..f9ccb8f829 100644
--- a/src/qml/jsruntime/qv4objectiterator.cpp
+++ b/src/qml/jsruntime/qv4objectiterator.cpp
@@ -68,15 +68,15 @@ ObjectIterator::ObjectIterator(Value *scratch1, Value *scratch2, uint flags)
     , memberIndex(0)
     , flags(flags)
 {
-    object->o = (Object*)0;
-    current->o = (Object*)0;
+    object->m = (Object*)0;
+    current->m = (Object*)0;
     // Caller needs to call init!
 }
 
 void ObjectIterator::init(Object *o)
 {
-    object->o = o;
-    current->o = o;
+    object->m = o;
+    current->m = o;
 
 #if QT_POINTER_SIZE == 4
     object->tag = QV4::Value::Managed_Type;
@@ -126,9 +126,9 @@ void ObjectIterator::next(String *&name, uint *index, Property *pd, PropertyAttr
         }
 
         if (flags & WithProtoChain)
-            current->o = current->objectValue()->prototype();
+            current->m = current->objectValue()->prototype();
         else
-            current->o = (Object *)0;
+            current->m = (Object *)0;
 
         arrayIndex = 0;
         memberIndex = 0;