From c4addf7d0e91cd39b636a88772ae9543f11e2c8c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 7 Jun 2021 15:28:54 +0200 Subject: Pass QMetaType by value rather than by ID in more places This saves us some ping-pong between the IDs and the QMetaTypes, and avoids possible ambiguities if multiple metatypes are registered for the same C++ type. Change-Id: I81cec94a9cd05d69927dc884f65574f0ab2ddc22 Reviewed-by: Maximilian Goldstein Reviewed-by: Fabian Kosmale --- src/qml/jsruntime/qv4sequenceobject_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/jsruntime/qv4sequenceobject_p.h') diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h index 603d33d6d8..d7bc7327c5 100644 --- a/src/qml/jsruntime/qv4sequenceobject_p.h +++ b/src/qml/jsruntime/qv4sequenceobject_p.h @@ -79,13 +79,13 @@ struct Q_QML_PRIVATE_EXPORT SequencePrototype : public QV4::Object static ReturnedValue method_valueOf(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); static ReturnedValue method_sort(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); - static ReturnedValue newSequence(QV4::ExecutionEngine *engine, int sequenceTypeId, QObject *object, int propertyIndex, bool readOnly, bool *succeeded); + static ReturnedValue newSequence(QV4::ExecutionEngine *engine, QMetaType sequenceType, QObject *object, int propertyIndex, bool readOnly, bool *succeeded); static ReturnedValue fromVariant(QV4::ExecutionEngine *engine, const QVariant &v, bool *succeeded); - static ReturnedValue fromData(QV4::ExecutionEngine *engine, const QMetaType &type, const void *data, bool *succeeded); + static ReturnedValue fromData(QV4::ExecutionEngine *engine, QMetaType type, const void *data, bool *succeeded); static int metaTypeForSequence(const Object *object); static QVariant toVariant(Object *object); - static QVariant toVariant(const Value &array, int typeHint, bool *succeeded); + static QVariant toVariant(const Value &array, QMetaType typeHint, bool *succeeded); static void* getRawContainerPtr(const Object *object, int typeHint); }; -- cgit v1.2.1