From 20a1002fba8c14514f5a40a9c468adb4c84410d3 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 17 Sep 2020 18:15:07 +0200 Subject: QQmlValueTypeProvider: Pass arguments as QJSValue This is so that we can replace them with factory functions as a next step. Change-Id: Ic8619e4e779bd3e47471642c556601555758697b Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlglobal.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/qml/qqmlglobal.cpp') diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 0cc7c525c7..0291701164 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -67,13 +67,13 @@ bool QQmlValueTypeProvider::initValueType(int type, QVariant& dst) return true; } -QVariant QQmlValueTypeProvider::createValueType(int type, int argc, const void *argv[]) +QVariant QQmlValueTypeProvider::createValueType(int type, const QJSValue ¶ms) { QVariant v; QQmlValueTypeProvider *p = this; do { - if (p->create(type, argc, argv, &v)) + if (p->create(type, params, &v)) return v; } while ((p = p->next)); @@ -169,7 +169,7 @@ bool QQmlValueTypeProvider::writeValueType(int type, const void *src, QVariant& return true; } -bool QQmlValueTypeProvider::create(int, int, const void *[], QVariant *) { return false; } +bool QQmlValueTypeProvider::create(int, const QJSValue &, QVariant *) { return false; } bool QQmlValueTypeProvider::createFromString(int, const QString &, void *, size_t) { return false; } bool QQmlValueTypeProvider::variantFromString(int, const QString &, QVariant *) { return false; } bool QQmlValueTypeProvider::variantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, QVariant *) { return false; } -- cgit v1.2.3