aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlglobal.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-18 15:27:24 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-23 14:54:47 +0200
commitad6d92d1bd2cd90cf8164fd445ad76432314bfab (patch)
tree17ec3753e9a77c5ff72c7115db12f17707d07f05 /src/qml/qml/qqmlglobal.cpp
parent548124fd008501d027f1aeb1fb9de03de233b320 (diff)
Eliminate QQmlValueTypeProvider::createFromString
It can be expressed as a special case of create() with a QJSValue. Change-Id: I7342026ad694077d2780dd8a852714fa72dd68d0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlglobal.cpp')
-rw-r--r--src/qml/qml/qqmlglobal.cpp5
1 files changed, 2 insertions, 3 deletions
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 &params
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; }