Unify the get and getIndexed vtable functions of QV4::Object

This finalizes the refactoring of Object's vtable API. Also added
the receiver argument to the method as required by the ES7 spec.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 8476d01f67..cd8563d06a 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -314,7 +314,7 @@ ReturnedValue QObjectWrapper::getQmlProperty(QQmlContextData *qmlContext, String
                 }
             }
         }
-        return QV4::Object::get(this, name, hasProperty);
+        return QV4::Object::get(this, name->identifier(), this, hasProperty);
     }
 
     QQmlData *ddata = QQmlData::get(d()->object(), false);
@@ -693,12 +693,14 @@ ReturnedValue QObjectWrapper::create(ExecutionEngine *engine, QObject *object)
     return (engine->memoryManager->allocate<QV4::QObjectWrapper>(object))->asReturnedValue();
 }
 
-QV4::ReturnedValue QObjectWrapper::get(const Managed *m, StringOrSymbol *name, bool *hasProperty)
+QV4::ReturnedValue QObjectWrapper::get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty)
 {
-    if (name->isSymbol())
-        return Object::get(m, name, hasProperty);
-    String *n = static_cast<String *>(name);
+    if (!id.isString())
+        return Object::get(m, id, receiver, hasProperty);
+
     const QObjectWrapper *that = static_cast<const QObjectWrapper*>(m);
+    Scope scope(that);
+    ScopedString n(scope, id.asHeapObject());
     QQmlContextData *qmlContext = that->engine()->callingQmlContext();
     return that->getQmlProperty(qmlContext, n, IgnoreRevision, hasProperty, /*includeImports*/ true);
 }
@@ -1708,7 +1710,7 @@ void CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q
             uint length = array->getLength();
             for (uint ii = 0; ii < length; ++ii)  {
                 QObject *o = nullptr;
-                qobjectWrapper = array->getIndexed(ii);
+                qobjectWrapper = array->get(ii);
                 if (!!qobjectWrapper)
                     o = qobjectWrapper->object();
                 qlistPtr->append(o);