diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-27 19:16:17 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:19:36 +0200 |
| commit | 0161f00e5043090f22b23de9822c09062b17d675 (patch) | |
| tree | e2a6d59028ada109a79c60d32186f9661eb5c67f /src/gui/util | |
| parent | 700e6341e51f5e6f45303fab3d0a84a3eb249eba (diff) | |
Use QMetaType in QMetaCallEvent
And don't use int based type mapping anymore.
Change-Id: I456e76d1933ef646a7bd39ce565886b89e938a44
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qshadergraphloader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp index 585becf47a..a938904651 100644 --- a/src/gui/util/qshadergraphloader.cpp +++ b/src/gui/util/qshadergraphloader.cpp @@ -187,21 +187,21 @@ void QShaderGraphLoader::load() 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<int>(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 { |