From 369cb1470d06b01934e616757ad98db2bb9ebb20 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 27 Jul 2020 17:31:27 +0200 Subject: Clean up int based convert() API Pass QMetaType instances instead. Change-Id: I07366cea566fdebf5bb793aa8087f8109216ec0c Reviewed-by: Thiago Macieira --- src/gui/util/qshadernodesloader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/util') diff --git a/src/gui/util/qshadernodesloader.cpp b/src/gui/util/qshadernodesloader.cpp index a29b0925e1..e6dcc8799b 100644 --- a/src/gui/util/qshadernodesloader.cpp +++ b/src/gui/util/qshadernodesloader.cpp @@ -160,21 +160,21 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) if (parameterValue.isObject()) { const QJsonObject parameterObject = parameterValue.toObject(); const QString type = parameterObject.value(QStringLiteral("type")).toString(); - const int typeId = QMetaType::fromName(type.toUtf8()).id(); + const auto metaType = QMetaType::fromName(type.toUtf8()); const QString value = parameterObject.value(QStringLiteral("value")).toString(); auto variant = QVariant(value); - if (QMetaType(typeId).flags() & QMetaType::IsEnumeration) { - const QMetaObject *metaObject = QMetaType(typeId).metaObject(); + if (metaType.flags() & QMetaType::IsEnumeration) { + const QMetaObject *metaObject = metaType.metaObject(); const char *className = metaObject->className(); const QByteArray enumName = type.mid(static_cast(qstrlen(className)) + 2).toUtf8(); const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName)); const int enumValue = metaEnum.keyToValue(value.toUtf8()); variant = QVariant(enumValue); - variant.convert(typeId); + variant.convert(metaType); } else { - variant.convert(typeId); + variant.convert(metaType); } node.setParameter(parameterName, variant); } else { -- cgit v1.2.3