1 files changed, 41 insertions, 41 deletions

diff --git a/src/qml/jsruntime/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h
index d491a62ddc..73cfddca5d 100644
--- a/src/qml/jsruntime/qv4lookup_p.h
+++ b/src/qml/jsruntime/qv4lookup_p.h
@@ -47,11 +47,11 @@ namespace QV4 {
 struct Lookup {
     enum { Size = 4 };
     union {
-        ReturnedValue (*indexedGetter)(Lookup *l, const ValueRef object, const ValueRef index);
-        void (*indexedSetter)(Lookup *l, const ValueRef object, const ValueRef index, const ValueRef v);
-        ReturnedValue (*getter)(Lookup *l, ExecutionEngine *engine, const ValueRef object);
+        ReturnedValue (*indexedGetter)(Lookup *l, const Value &object, const Value &index);
+        void (*indexedSetter)(Lookup *l, const Value &object, const Value &index, const Value &v);
+        ReturnedValue (*getter)(Lookup *l, ExecutionEngine *engine, const Value &object);
         ReturnedValue (*globalGetter)(Lookup *l, ExecutionEngine *engine);
-        void (*setter)(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef v);
+        void (*setter)(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &v);
     };
     union {
         ExecutionEngine *engine;
@@ -70,34 +70,34 @@ struct Lookup {
     uint index;
     uint nameIndex;
 
-    static ReturnedValue indexedGetterGeneric(Lookup *l, const ValueRef object, const ValueRef index);
-    static ReturnedValue indexedGetterFallback(Lookup *l, const ValueRef object, const ValueRef index);
-    static ReturnedValue indexedGetterObjectInt(Lookup *l, const ValueRef object, const ValueRef index);
-
-    static void indexedSetterGeneric(Lookup *l, const ValueRef object, const ValueRef index, const ValueRef v);
-    static void indexedSetterFallback(Lookup *l, const ValueRef object, const ValueRef index, const ValueRef value);
-    static void indexedSetterObjectInt(Lookup *l, const ValueRef object, const ValueRef index, const ValueRef v);
-
-    static ReturnedValue getterGeneric(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getterTwoClasses(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getterFallback(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-
-    static ReturnedValue getter0(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getter1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getter2(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getter0getter0(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getter0getter1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getter1getter1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getterAccessor0(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getterAccessor1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue getterAccessor2(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-
-    static ReturnedValue primitiveGetter0(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue primitiveGetter1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue primitiveGetterAccessor0(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue primitiveGetterAccessor1(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue stringLengthGetter(Lookup *l, ExecutionEngine *engine, const ValueRef object);
-    static ReturnedValue arrayLengthGetter(Lookup *l, ExecutionEngine *engine, const ValueRef object);
+    static ReturnedValue indexedGetterGeneric(Lookup *l, const Value &object, const Value &index);
+    static ReturnedValue indexedGetterFallback(Lookup *l, const Value &object, const Value &index);
+    static ReturnedValue indexedGetterObjectInt(Lookup *l, const Value &object, const Value &index);
+
+    static void indexedSetterGeneric(Lookup *l, const Value &object, const Value &index, const Value &v);
+    static void indexedSetterFallback(Lookup *l, const Value &object, const Value &index, const Value &value);
+    static void indexedSetterObjectInt(Lookup *l, const Value &object, const Value &index, const Value &v);
+
+    static ReturnedValue getterGeneric(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getterTwoClasses(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getterFallback(Lookup *l, ExecutionEngine *engine, const Value &object);
+
+    static ReturnedValue getter0(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getter1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getter2(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getter0getter0(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getter0getter1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getter1getter1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getterAccessor0(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getterAccessor1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue getterAccessor2(Lookup *l, ExecutionEngine *engine, const Value &object);
+
+    static ReturnedValue primitiveGetter0(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue primitiveGetter1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue primitiveGetterAccessor0(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue primitiveGetterAccessor1(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue stringLengthGetter(Lookup *l, ExecutionEngine *engine, const Value &object);
+    static ReturnedValue arrayLengthGetter(Lookup *l, ExecutionEngine *engine, const Value &object);
 
     static ReturnedValue globalGetterGeneric(Lookup *l, ExecutionEngine *engine);
     static ReturnedValue globalGetter0(Lookup *l, ExecutionEngine *engine);
@@ -107,16 +107,16 @@ struct Lookup {
     static ReturnedValue globalGetterAccessor1(Lookup *l, ExecutionEngine *engine);
     static ReturnedValue globalGetterAccessor2(Lookup *l, ExecutionEngine *engine);
 
-    static void setterGeneric(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setterTwoClasses(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setterFallback(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setter0(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setterInsert0(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setterInsert1(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setterInsert2(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
-    static void setter0setter0(Lookup *l, ExecutionEngine *engine, const ValueRef object, const ValueRef value);
+    static void setterGeneric(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setterTwoClasses(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setterFallback(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setter0(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setterInsert0(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setterInsert1(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setterInsert2(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
+    static void setter0setter0(Lookup *l, ExecutionEngine *engine, const Value &object, const Value &value);
 
-    ReturnedValue lookup(ValueRef thisObject, Object *obj, PropertyAttributes *attrs);
+    ReturnedValue lookup(const Value &thisObject, Object *obj, PropertyAttributes *attrs);
     ReturnedValue lookup(Object *obj, PropertyAttributes *attrs);
 
 };