QtQml: Simplify AOT lookup initialization API

We don't need the type arguments anymore. Change the functions to not
accept them and the code generator to not generate them.

This involves remembering the "isShadowable" flag until we potentially
have to re-initialize a lookup for a write back operation.

Change-Id: I036f87de20061ae9f2c7588a41bcdca0cd72df02
Reviewed-by: Olivier De Cannière <[email protected]>

1 files changed, 36 insertions, 0 deletions

diff --git a/src/qml/compat/removed_api.cpp b/src/qml/compat/removed_api.cpp
index d812d36282..6ab4ebe2ab 100644
--- a/src/qml/compat/removed_api.cpp
+++ b/src/qml/compat/removed_api.cpp
@@ -149,4 +149,40 @@ void QQmlPrivate::AOTCompiledContext::initCallGlobalLookup(uint index) const
     engine->handle()->amendException();
 }
 
+void QQmlPrivate::AOTCompiledContext::initLoadScopeObjectPropertyLookup(
+        uint index, QMetaType type) const
+{
+    Q_UNUSED(type);
+    return initLoadScopeObjectPropertyLookup(index);
+}
+
+void QQmlPrivate::AOTCompiledContext::initGetObjectLookup(
+        uint index, QObject *object, QMetaType type) const
+{
+    return type == QMetaType::fromType<QVariant>()
+            ? initGetObjectLookupAsVariant(index, object)
+            : initGetObjectLookup(index, object);
+}
+
+void QQmlPrivate::AOTCompiledContext::initSetObjectLookup(
+        uint index, QObject *object, QMetaType type) const
+{
+    return type == QMetaType::fromType<QVariant>()
+            ? initSetObjectLookupAsVariant(index, object)
+            : initSetObjectLookup(index, object);
+}
+
+void QQmlPrivate::AOTCompiledContext::initGetValueLookup(
+        uint index, const QMetaObject *metaObject, QMetaType type) const {
+    Q_UNUSED(type);
+    initGetValueLookup(index, metaObject);
+}
+
+void QQmlPrivate::AOTCompiledContext::initSetValueLookup(
+        uint index, const QMetaObject *metaObject, QMetaType type) const
+{
+    Q_UNUSED(type);
+    initSetValueLookup(index, metaObject);
+}
+
 #endif