From ad6d92d1bd2cd90cf8164fd445ad76432314bfab Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 18 Sep 2020 15:27:24 +0200 Subject: Eliminate QQmlValueTypeProvider::createFromString It can be expressed as a special case of create() with a QJSValue. Change-Id: I7342026ad694077d2780dd8a852714fa72dd68d0 Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlglobal.cpp | 5 ++--- 1 file changed, 2 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 558da1d64b..1fbb9889c2 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -80,13 +80,13 @@ QVariant QQmlValueTypeProvider::createValueType(int type, const QJSValue ¶ms return QVariant(); } -bool QQmlValueTypeProvider::createValueFromString(int type, const QString &s, void *data, size_t n) +bool QQmlValueTypeProvider::createValueFromString(int type, const QJSValue &s, QVariant *data) { Q_ASSERT(data); QQmlValueTypeProvider *p = this; do { - if (p->createFromString(type, s, data, n)) + if (p->create(type, s, data)) return true; } while ((p = p->next)); @@ -169,7 +169,6 @@ bool QQmlValueTypeProvider::writeValueType(int type, const void *src, QVariant& } 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::store(int, const void *, void *, size_t) { return false; } -- cgit v1.2.3