QtQml: Move QMetaObjectWrapper into separate header/impl files

We want to use it from QQmlTypeWrapper and avoid circular includes.

Task-number: QTBUG-124662
Change-Id: I4c78a17eb262a303b7239bbdd853ec02d609c330
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

9 files changed, 218 insertions, 140 deletions

diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index fa672d3d6c..cbcdc2f8f9 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -255,6 +255,7 @@ qt_internal_add_qml_module(Qml
         jsruntime/qv4property_p.h
         jsruntime/qv4propertykey.cpp jsruntime/qv4propertykey_p.h
         jsruntime/qv4proxy.cpp jsruntime/qv4proxy_p.h
+        jsruntime/qv4qmetaobjectwrapper.cpp jsruntime/qv4qmetaobjectwrapper_p.h
         jsruntime/qv4qmlcontext.cpp jsruntime/qv4qmlcontext_p.h
         jsruntime/qv4qobjectwrapper.cpp jsruntime/qv4qobjectwrapper_p.h
         jsruntime/qv4reflect.cpp jsruntime/qv4reflect_p.h
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 42a279ca25..8346ef5d84 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -16,6 +16,7 @@
 #include <private/qqmlbuiltinfunctions_p.h>
 #include <private/qqmldebugconnector_p.h>
 #include <private/qv4qobjectwrapper_p.h>
+#include <private/qv4qmetaobjectwrapper_p.h>
 #include <private/qv4stackframe_p.h>
 #include <private/qv4module_p.h>
 #include <private/qv4symbol_p.h>
diff --git a/src/qml/jsapi/qjsmanagedvalue.cpp b/src/qml/jsapi/qjsmanagedvalue.cpp
index a4f2f97432..452f991a26 100644
--- a/src/qml/jsapi/qjsmanagedvalue.cpp
+++ b/src/qml/jsapi/qjsmanagedvalue.cpp
@@ -13,6 +13,7 @@
 #include <QtQml/private/qv4urlobject_p.h>
 #include <QtQml/private/qv4variantobject_p.h>
 #include <QtQml/private/qv4qobjectwrapper_p.h>
+#include <QtQml/private/qv4qmetaobjectwrapper_p.h>
 #include <QtQml/private/qv4regexpobject_p.h>
 #include <QtQml/private/qv4dateobject_p.h>
 #include <QtQml/private/qv4errorobject_p.h>
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 5d320809dd..f6b97262c3 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -19,6 +19,7 @@
 #include <private/qv4mm_p.h>
 #include <private/qv4jscall_p.h>
 #include <private/qv4qobjectwrapper_p.h>
+#include <private/qv4qmetaobjectwrapper_p.h>
 #include <private/qv4urlobject_p.h>
 #include <private/qqmlbuiltins_p.h>
 
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 6b84146866..a2a2e99a01 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -61,6 +61,7 @@
 #include "qv4variantobject_p.h"
 #include "qv4sequenceobject_p.h"
 #include "qv4qobjectwrapper_p.h"
+#include "qv4qmetaobjectwrapper_p.h"
 #include "qv4memberdata_p.h"
 #include "qv4arraybuffer_p.h"
 #include "qv4dataview_p.h"
diff --git a/src/qml/jsruntime/qv4qmetaobjectwrapper.cpp b/src/qml/jsruntime/qv4qmetaobjectwrapper.cpp
new file mode 100644
index 0000000000..13d93c7122
--- /dev/null
+++ b/src/qml/jsruntime/qv4qmetaobjectwrapper.cpp
@@ -0,0 +1,126 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "qv4qmetaobjectwrapper_p.h"
+
+#include <private/qqmlobjectorgadget_p.h>
+#include <private/qv4jscall_p.h>
+#include <private/qv4qobjectwrapper_p.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace Qt::StringLiterals;
+
+namespace QV4 {
+
+void Heap::QMetaObjectWrapper::init(const QMetaObject *metaObject)
+{
+    FunctionObject::init();
+    this->metaObject = metaObject;
+    constructors = nullptr;
+    constructorCount = 0;
+}
+
+void Heap::QMetaObjectWrapper::destroy()
+{
+    delete[] constructors;
+}
+
+void Heap::QMetaObjectWrapper::ensureConstructorsCache() {
+
+    const int count = metaObject->constructorCount();
+    if (constructorCount != count) {
+        delete[] constructors;
+        constructorCount = count;
+        if (count == 0) {
+            constructors = nullptr;
+            return;
+        }
+        constructors = new QQmlPropertyData[count];
+
+        for (int i = 0; i < count; ++i) {
+            QMetaMethod method = metaObject->constructor(i);
+            QQmlPropertyData &d = constructors[i];
+            d.load(method);
+            d.setCoreIndex(i);
+        }
+    }
+}
+
+
+ReturnedValue QMetaObjectWrapper::create(ExecutionEngine *engine, const QMetaObject* metaObject) {
+
+     Scope scope(engine);
+     Scoped<QMetaObjectWrapper> mo(scope, engine->memoryManager->allocate<QMetaObjectWrapper>(metaObject)->asReturnedValue());
+     mo->init(engine);
+     return mo->asReturnedValue();
+}
+
+void QMetaObjectWrapper::init(ExecutionEngine *) {
+    const QMetaObject & mo = *d()->metaObject;
+
+    for (int i = 0; i < mo.enumeratorCount(); i++) {
+        QMetaEnum Enum = mo.enumerator(i);
+        for (int k = 0; k < Enum.keyCount(); k++) {
+            const char* key = Enum.key(k);
+            const int value = Enum.value(k);
+            defineReadonlyProperty(QLatin1String(key), Value::fromInt32(value));
+        }
+    }
+}
+
+ReturnedValue QMetaObjectWrapper::virtualCallAsConstructor(const FunctionObject *f, const Value *argv, int argc, const Value *)
+{
+    const QMetaObjectWrapper *This = static_cast<const QMetaObjectWrapper*>(f);
+    return This->constructInternal(argv, argc);
+}
+
+ReturnedValue QMetaObjectWrapper::constructInternal(const Value *argv, int argc) const
+{
+
+    d()->ensureConstructorsCache();
+
+    ExecutionEngine *v4 = engine();
+    const QMetaObject* mo = d()->metaObject;
+    if (d()->constructorCount == 0) {
+        return v4->throwTypeError(QLatin1String(mo->className())
+                                  + QLatin1String(" has no invokable constructor"));
+    }
+
+    Scope scope(v4);
+    Scoped<QObjectWrapper> object(scope);
+    JSCallData cData(nullptr, argv, argc);
+    CallData *callData = cData.callData(scope);
+
+    const QQmlObjectOrGadget objectOrGadget(mo);
+
+    if (d()->constructorCount == 1) {
+        object = QObjectMethod::callPrecise(
+                objectOrGadget, d()->constructors[0], v4, callData, QMetaObject::CreateInstance);
+    } else if (const QQmlPropertyData *ctor = QObjectMethod::resolveOverloaded(
+                    objectOrGadget, d()->constructors, d()->constructorCount, v4, callData)) {
+        object = QObjectMethod::callPrecise(
+                objectOrGadget, *ctor, v4, callData, QMetaObject::CreateInstance);
+    }
+    if (object) {
+        Scoped<QMetaObjectWrapper> metaObject(scope, this);
+        object->defineDefaultProperty(v4->id_constructor(), metaObject);
+        object->setPrototypeOf(const_cast<QMetaObjectWrapper*>(this));
+    }
+
+    return object.asReturnedValue();
+}
+
+bool QMetaObjectWrapper::virtualIsEqualTo(Managed *a, Managed *b)
+{
+    const QMetaObjectWrapper *aMetaObject = a->as<QMetaObjectWrapper>();
+    Q_ASSERT(aMetaObject);
+    const QMetaObjectWrapper *bMetaObject = b->as<QMetaObjectWrapper>();
+    return bMetaObject && aMetaObject->metaObject() == bMetaObject->metaObject();
+}
+
+DEFINE_OBJECT_VTABLE(QMetaObjectWrapper);
+
+} // namespace QV4
+
+QT_END_NAMESPACE
diff --git a/src/qml/jsruntime/qv4qmetaobjectwrapper_p.h b/src/qml/jsruntime/qv4qmetaobjectwrapper_p.h
new file mode 100644
index 0000000000..063bc089e7
--- /dev/null
+++ b/src/qml/jsruntime/qv4qmetaobjectwrapper_p.h
@@ -0,0 +1,66 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QV4QMETAOBJECTWRAPPER_P_H
+#define QV4QMETAOBJECTWRAPPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qv4functionobject_p.h>
+#include <private/qv4value_p.h>
+
+#include <QtCore/qmetaobject.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlPropertyData;
+
+namespace QV4 {
+namespace Heap {
+
+struct QMetaObjectWrapper : FunctionObject {
+    const QMetaObject* metaObject;
+    QQmlPropertyData *constructors;
+    int constructorCount;
+
+    void init(const QMetaObject* metaObject);
+    void destroy();
+    void ensureConstructorsCache();
+};
+
+} // namespace Heap
+
+struct Q_QML_EXPORT QMetaObjectWrapper : public FunctionObject
+{
+    V4_OBJECT2(QMetaObjectWrapper, FunctionObject)
+    V4_NEEDS_DESTROY
+
+    static ReturnedValue create(ExecutionEngine *engine, const QMetaObject* metaObject);
+    const QMetaObject *metaObject() const { return d()->metaObject; }
+
+protected:
+    static ReturnedValue virtualCallAsConstructor(
+            const FunctionObject *, const Value *argv, int argc, const Value *);
+    static bool virtualIsEqualTo(Managed *a, Managed *b);
+
+private:
+    void init(ExecutionEngine *engine);
+    ReturnedValue constructInternal(const Value *argv, int argc) const;
+};
+
+} // namespace QV4
+
+QT_END_NAMESPACE
+
+#endif // QV4QMETAOBJECTWRAPPER_P_H
+
+
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 2cbb152dd0..5f85aae89e 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1924,9 +1924,9 @@ static bool requiresStrictArguments(const QQmlObjectOrGadget &object)
             && metaObject->classInfo(indexOfClassInfo).value() == QByteArrayView("true");
 }
 
-static ReturnedValue CallPrecise(const QQmlObjectOrGadget &object, const QQmlPropertyData &data,
-                                      ExecutionEngine *engine, CallData *callArgs,
-                                      QMetaObject::Call callType = QMetaObject::InvokeMetaMethod)
+ReturnedValue QObjectMethod::callPrecise(
+        const QQmlObjectOrGadget &object, const QQmlPropertyData &data, ExecutionEngine *engine,
+        CallData *callArgs, QMetaObject::Call callType)
 {
     QByteArray unknownTypeError;
 
@@ -2011,7 +2011,7 @@ Resolve the overloaded method to call.  The algorithm works conceptually like th
         If two or more overloads have the same match score, return the last one. The match
         score is constructed by adding the matchScore() result for each of the parameters.
 */
-static const QQmlPropertyData *ResolveOverloaded(
+const QQmlPropertyData *QObjectMethod::resolveOverloaded(
             const QQmlObjectOrGadget &object, const QQmlPropertyData *methods, int methodCount,
             ExecutionEngine *engine, CallData *callArgs)
 {
@@ -2165,7 +2165,7 @@ static bool ExactMatch(QMetaType passed, QMetaType required, const void *data)
     return false;
 }
 
-static const QQmlPropertyData *ResolveOverloaded(
+const QQmlPropertyData *QObjectMethod::resolveOverloaded(
         const QQmlPropertyData *methods, int methodCount,
         void **argv, int argc, const QMetaType *types)
 {
@@ -2944,7 +2944,7 @@ ReturnedValue QObjectMethod::callInternal(const Value *thisObject, const Value *
 
     if (d()->methodCount != 1) {
         Q_ASSERT(d()->methodCount > 0);
-        method = ResolveOverloaded(object, d()->methods, d()->methodCount, v4, callData);
+        method = resolveOverloaded(object, d()->methods, d()->methodCount, v4, callData);
         if (method == nullptr)
             return Encode::undefined();
     }
@@ -2962,7 +2962,7 @@ ReturnedValue QObjectMethod::callInternal(const Value *thisObject, const Value *
         });
     }
 
-    return doCall([&]() { return CallPrecise(object, *method, v4, callData); });
+    return doCall([&]() { return callPrecise(object, *method, v4, callData); });
 }
 
 struct ToStringMetaMethod
@@ -3032,7 +3032,7 @@ void QObjectMethod::callInternalWithMetaTypes(
     const QQmlPropertyData *method = d()->methods;
     if (d()->methodCount != 1) {
         Q_ASSERT(d()->methodCount > 0);
-        method = ResolveOverloaded(d()->methods, d()->methodCount, argv, argc, types);
+        method = resolveOverloaded(d()->methods, d()->methodCount, argv, argc, types);
     }
 
     if (!method || method->isV4Function()) {
@@ -3084,114 +3084,6 @@ void QObjectMethod::callInternalWithMetaTypes(
 
 DEFINE_OBJECT_VTABLE(QObjectMethod);
 
-
-void Heap::QMetaObjectWrapper::init(const QMetaObject *metaObject)
-{
-    FunctionObject::init();
-    this->metaObject = metaObject;
-    constructors = nullptr;
-    constructorCount = 0;
-}
-
-void Heap::QMetaObjectWrapper::destroy()
-{
-    delete[] constructors;
-}
-
-void Heap::QMetaObjectWrapper::ensureConstructorsCache() {
-
-    const int count = metaObject->constructorCount();
-    if (constructorCount != count) {
-        delete[] constructors;
-        constructorCount = count;
-        if (count == 0) {
-            constructors = nullptr;
-            return;
-        }
-        constructors = new QQmlPropertyData[count];
-
-        for (int i = 0; i < count; ++i) {
-            QMetaMethod method = metaObject->constructor(i);
-            QQmlPropertyData &d = constructors[i];
-            d.load(method);
-            d.setCoreIndex(i);
-        }
-    }
-}
-
-
-ReturnedValue QMetaObjectWrapper::create(ExecutionEngine *engine, const QMetaObject* metaObject) {
-
-     Scope scope(engine);
-     Scoped<QMetaObjectWrapper> mo(scope, engine->memoryManager->allocate<QMetaObjectWrapper>(metaObject)->asReturnedValue());
-     mo->init(engine);
-     return mo->asReturnedValue();
-}
-
-void QMetaObjectWrapper::init(ExecutionEngine *) {
-    const QMetaObject & mo = *d()->metaObject;
-
-    for (int i = 0; i < mo.enumeratorCount(); i++) {
-        QMetaEnum Enum = mo.enumerator(i);
-        for (int k = 0; k < Enum.keyCount(); k++) {
-            const char* key = Enum.key(k);
-            const int value = Enum.value(k);
-            defineReadonlyProperty(QLatin1String(key), Value::fromInt32(value));
-        }
-    }
-}
-
-ReturnedValue QMetaObjectWrapper::virtualCallAsConstructor(const FunctionObject *f, const Value *argv, int argc, const Value *)
-{
-    const QMetaObjectWrapper *This = static_cast<const QMetaObjectWrapper*>(f);
-    return This->constructInternal(argv, argc);
-}
-
-ReturnedValue QMetaObjectWrapper::constructInternal(const Value *argv, int argc) const
-{
-
-    d()->ensureConstructorsCache();
-
-    ExecutionEngine *v4 = engine();
-    const QMetaObject* mo = d()->metaObject;
-    if (d()->constructorCount == 0) {
-        return v4->throwTypeError(QLatin1String(mo->className())
-                                  + QLatin1String(" has no invokable constructor"));
-    }
-
-    Scope scope(v4);
-    Scoped<QObjectWrapper> object(scope);
-    JSCallData cData(nullptr, argv, argc);
-    CallData *callData = cData.callData(scope);
-
-    const QQmlObjectOrGadget objectOrGadget(mo);
-
-    if (d()->constructorCount == 1) {
-        object = CallPrecise(objectOrGadget, d()->constructors[0], v4, callData, QMetaObject::CreateInstance);
-    } else if (const QQmlPropertyData *ctor = ResolveOverloaded(
-                    objectOrGadget, d()->constructors, d()->constructorCount, v4, callData)) {
-        object = CallPrecise(objectOrGadget, *ctor, v4, callData, QMetaObject::CreateInstance);
-    }
-    if (object) {
-        Scoped<QMetaObjectWrapper> metaObject(scope, this);
-        object->defineDefaultProperty(v4->id_constructor(), metaObject);
-        object->setPrototypeOf(const_cast<QMetaObjectWrapper*>(this));
-    }
-    return object.asReturnedValue();
-
-}
-
-bool QMetaObjectWrapper::virtualIsEqualTo(Managed *a, Managed *b)
-{
-    const QMetaObjectWrapper *aMetaObject = a->as<QMetaObjectWrapper>();
-    Q_ASSERT(aMetaObject);
-    const QMetaObjectWrapper *bMetaObject = b->as<QMetaObjectWrapper>();
-    return bMetaObject && aMetaObject->metaObject() == bMetaObject->metaObject();
-}
-
-DEFINE_OBJECT_VTABLE(QMetaObjectWrapper);
-
-
 void Heap::QmlSignalHandler::init(QObject *object, int signalIndex)
 {
     Object::init();
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index 7225612f08..1af8fc887f 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -33,6 +33,7 @@ class QObject;
 class QQmlData;
 class QQmlPropertyCache;
 class QQmlPropertyData;
+class QQmlObjectOrGadget;
 
 namespace QV4 {
 struct QObjectSlotDispatcher;
@@ -97,16 +98,6 @@ DECLARE_EXPORTED_HEAP_OBJECT(QObjectMethod, FunctionObject) {
     QV4::Heap::QObjectMethod::ThisObjectMode checkThisObject(const QMetaObject *thisMeta) const;
 };
 
-struct QMetaObjectWrapper : FunctionObject {
-    const QMetaObject* metaObject;
-    QQmlPropertyData *constructors;
-    int constructorCount;
-
-    void init(const QMetaObject* metaObject);
-    void destroy();
-    void ensureConstructorsCache();
-};
-
 struct QmlSignalHandler : Object {
     void init(QObject *object, int signalIndex);
     void destroy() {
@@ -385,24 +376,22 @@ struct Q_QML_EXPORT QObjectMethod : public QV4::FunctionObject
             QObject *thisObject, void **argv, const QMetaType *types, int argc) const;
 
     static QPair<QObject *, int> extractQtMethod(const QV4::FunctionObject *function);
-};
-
 
-struct Q_QML_EXPORT QMetaObjectWrapper : public QV4::FunctionObject
-{
-    V4_OBJECT2(QMetaObjectWrapper, QV4::FunctionObject)
-    V4_NEEDS_DESTROY
+private:
+    friend struct QMetaObjectWrapper;
 
-    static ReturnedValue create(ExecutionEngine *engine, const QMetaObject* metaObject);
-    const QMetaObject *metaObject() const { return d()->metaObject; }
+    static const QQmlPropertyData *resolveOverloaded(
+            const QQmlObjectOrGadget &object, const QQmlPropertyData *methods, int methodCount,
+            ExecutionEngine *engine, CallData *callArgs);
 
-protected:
-    static ReturnedValue virtualCallAsConstructor(const FunctionObject *, const Value *argv, int argc, const Value *);
-    static bool virtualIsEqualTo(Managed *a, Managed *b);
+    static const QQmlPropertyData *resolveOverloaded(
+            const QQmlPropertyData *methods, int methodCount,
+            void **argv, int argc, const QMetaType *types);
 
-private:
-    void init(ExecutionEngine *engine);
-    ReturnedValue constructInternal(const Value *argv, int argc) const;
+    static ReturnedValue callPrecise(
+            const QQmlObjectOrGadget &object, const QQmlPropertyData &data,
+            ExecutionEngine *engine, CallData *callArgs,
+            QMetaObject::Call callType = QMetaObject::InvokeMetaMethod);
 };
 
 struct Q_QML_EXPORT QmlSignalHandler : public QV4::Object