From 625fd895cea56f417dad8f9f34ebb151564e360e Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 23 May 2024 17:13:58 +0200 Subject: [PATCH] Fix more metatype related deprecation warnings QT_DEPRECATED_VERSION_6_0 static int type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName) Change-Id: I6a085c6d370b6d65193dc09d4318765de81a8ce3 Reviewed-by: Christian Stenger --- src/libs/utils/persistentsettings.cpp | 2 +- .../edit3d/bakelightsconnectionmanager.cpp | 2 +- .../imagecacheconnectionmanager.cpp | 2 +- .../instances/baseconnectionmanager.cpp | 4 +-- .../interactiveconnectionmanager.cpp | 2 +- .../instances/nodeinstanceserverproxy.cpp | 26 +++++++++---------- .../designercore/model/propertyparser.cpp | 4 +-- .../designercore/model/texttomodelmerger.cpp | 20 +++++++------- .../instances/nodeinstanceclientproxy.cpp | 4 +-- .../qml/qmldesigner/testconnectionmanager.cpp | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index 3702ecf960b..a9888356f4b 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -283,7 +283,7 @@ QVariant ParseContext::readSimpleValue(QXmlStreamReader &r, const QXmlStreamAttr } QVariant value; value.setValue(text); - value.convert(QMetaType::type(type.toLatin1().constData())); + value.convert(QMetaType::fromName(type.toLatin1().constData())); return value; } diff --git a/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp b/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp index e8faa42833d..92caab65edd 100644 --- a/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp +++ b/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp @@ -27,7 +27,7 @@ void BakeLightsConnectionManager::setFinishedCallback(Callback callback) void BakeLightsConnectionManager::dispatchCommand(const QVariant &command, ConnectionManagerInterface::Connection &) { - static const int commandType = QMetaType::type("PuppetToCreatorCommand"); + static const int commandType = QMetaType::fromName("PuppetToCreatorCommand").id(); if (command.typeId() == commandType) { auto cmd = command.value(); diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp index 20728b445e4..f8a41b620bb 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp @@ -45,7 +45,7 @@ bool ImageCacheConnectionManager::waitForCapturedData() void ImageCacheConnectionManager::dispatchCommand(const QVariant &command, ConnectionManagerInterface::Connection &) { - static const int capturedDataCommandType = QMetaType::type("CapturedDataCommand"); + static const int capturedDataCommandType = QMetaType::fromName("CapturedDataCommand").id(); if (command.typeId() == capturedDataCommandType) { m_captureCallback(command.value().image); diff --git a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp index 713a61abf3d..0c64bba23c0 100644 --- a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp @@ -107,8 +107,8 @@ void BaseConnectionManager::readDataStream(Connection &connection) connection.blockSize = 0; #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED - if (command.typeId() != QMetaType::type("PuppetAliveCommand")) { - if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) { + if (command.typeId() != QMetaType::fromName("PuppetAliveCommand").id()) { + if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) { SyncNanotraceCommand cmd = command.value(); NANOTRACE_INSTANT_ARGS("Sync", "readCommand", {"name", cmd.name().toStdString()}, diff --git a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp index cd36cac76da..07ae483d9a1 100644 --- a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp @@ -68,7 +68,7 @@ void InteractiveConnectionManager::showCannotConnectToPuppetWarningAndSwitchToEd void InteractiveConnectionManager::dispatchCommand(const QVariant &command, Connection &connection) { - static const int puppetAliveCommandType = QMetaType::type("PuppetAliveCommand"); + static const int puppetAliveCommandType = QMetaType::fromName("PuppetAliveCommand").id(); if (command.typeId() == puppetAliveCommandType) { puppetAlive(connection); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index a519531d3cc..ab8cca8e16c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -93,18 +93,18 @@ void NodeInstanceServerProxy::dispatchCommand(const QVariant &command) { NANOTRACE_SCOPE_ARGS("Update", "dispatchCommand", {"name", command.typeName()}); - static const int informationChangedCommandType = QMetaType::type("InformationChangedCommand"); - static const int valuesChangedCommandType = QMetaType::type("ValuesChangedCommand"); - static const int valuesModifiedCommandType = QMetaType::type("ValuesModifiedCommand"); - static const int pixmapChangedCommandType = QMetaType::type("PixmapChangedCommand"); - static const int childrenChangedCommandType = QMetaType::type("ChildrenChangedCommand"); - static const int statePreviewImageChangedCommandType = QMetaType::type("StatePreviewImageChangedCommand"); - static const int componentCompletedCommandType = QMetaType::type("ComponentCompletedCommand"); - static const int tokenCommandType = QMetaType::type("TokenCommand"); - static const int debugOutputCommandType = QMetaType::type("DebugOutputCommand"); - static const int changeSelectionCommandType = QMetaType::type("ChangeSelectionCommand"); - static const int puppetToCreatorCommandType = QMetaType::type("PuppetToCreatorCommand"); - static const int SyncNanotraceCommandType = QMetaType::type("SyncNanotraceCommand"); + static const int informationChangedCommandType = QMetaType::fromName("InformationChangedCommand").id(); + static const int valuesChangedCommandType = QMetaType::fromName("ValuesChangedCommand").id(); + static const int valuesModifiedCommandType = QMetaType::fromName("ValuesModifiedCommand").id(); + static const int pixmapChangedCommandType = QMetaType::fromName("PixmapChangedCommand").id(); + static const int childrenChangedCommandType = QMetaType::fromName("ChildrenChangedCommand").id(); + static const int statePreviewImageChangedCommandType = QMetaType::fromName("StatePreviewImageChangedCommand").id(); + static const int componentCompletedCommandType = QMetaType::fromName("ComponentCompletedCommand").id(); + static const int tokenCommandType = QMetaType::fromName("TokenCommand").id(); + static const int debugOutputCommandType = QMetaType::fromName("DebugOutputCommand").id(); + static const int changeSelectionCommandType = QMetaType::fromName("ChangeSelectionCommand").id(); + static const int puppetToCreatorCommandType = QMetaType::fromName("PuppetToCreatorCommand").id(); + static const int SyncNanotraceCommandType = QMetaType::fromName("SyncNanotraceCommand").id(); qCInfo(instanceViewBenchmark) << "dispatching command" << command.typeId() << command.typeName(); if (command.typeId() == informationChangedCommandType) { @@ -173,7 +173,7 @@ QString NodeInstanceServerProxy::qrcMappingString() const void NodeInstanceServerProxy::writeCommand(const QVariant &command) { #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED - if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) { + if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) { SyncNanotraceCommand cmd = command.value(); NANOTRACE_INSTANT_ARGS("Sync", "writeCommand", {"name", cmd.name().toStdString()}, diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp index 264c944feab..f1199425d30 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp @@ -201,7 +201,7 @@ QVariant read(const QString &typeStr, const QString &str, const MetaInfo &) QVariant read(const QString &typeStr, const QString &str) { - int type = QMetaType::fromName(typeStr.toUtf8().constData()).id(); + int type = QMetaType::fromName(typeStr.toUtf8()).id(); if (type == 0) { if (typeStr != "binding"_L1 && typeStr != "enum"_L1) { qWarning() << "Type " << typeStr @@ -266,7 +266,7 @@ QVariant read(int variantType, const QString &str) value = vector3DFromString(str, &conversionOk); break; default: { - if (variantType == QMetaType::type("Enumeration")) { + if (variantType == QMetaType::fromName("Enumeration").id()) { value = QVariant::fromValue(enumerationFromString(str, &conversionOk)); } else { value = QVariant(str); diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ded7fbc5ef4..5e82c3545ab 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -242,23 +242,23 @@ bool isLiteralValue(AST::UiScriptBinding *script) int propertyType(const QString &typeName) { if (typeName == u"bool") - return QMetaType::type("bool"); + return QMetaType::fromName("bool").id(); else if (typeName == u"color") - return QMetaType::type("QColor"); + return QMetaType::fromName("QColor").id(); else if (typeName == u"date") - return QMetaType::type("QDate"); + return QMetaType::fromName("QDate").id(); else if (typeName == u"int") - return QMetaType::type("int"); + return QMetaType::fromName("int").id(); else if (typeName == u"real") - return QMetaType::type("double"); + return QMetaType::fromName("double").id(); else if (typeName == u"double") - return QMetaType::type("double"); + return QMetaType::fromName("double").id(); else if (typeName == u"string") - return QMetaType::type("QString"); + return QMetaType::fromName("QString").id(); else if (typeName == u"url") - return QMetaType::type("QUrl"); + return QMetaType::fromName("QUrl").id(); else if (typeName == u"var" || typeName == u"variant") - return QMetaType::type("QVariant"); + return QMetaType::fromName("QVariant").id(); else return -1; } @@ -272,7 +272,7 @@ QVariant convertDynamicPropertyValueToVariant(const QString &astValue, return QString(); const int type = propertyType(astType); - if (type == QMetaType::type("QVariant")) { + if (type == QMetaType::fromName("QVariant").id()) { if (cleanedValue.isNull()) // Explicitly isNull, NOT isEmpty! return QVariant(static_cast(type)); else diff --git a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp index de07782d1cf..47a5bfedaab 100644 --- a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp +++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp @@ -391,8 +391,8 @@ void NodeInstanceClientProxy::readDataStream() QVariant command = readCommandFromIOStream(m_inputIoDevice, &readCommandCounter, &blockSize); #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED - if (command.typeId() != QMetaType::type("EndNanotraceCommand")) { - if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) { + if (command.typeId() != QMetaType::fromName("EndNanotraceCommand").id()) { + if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) { SyncNanotraceCommand cmd = command.value(); NANOTRACE_INSTANT_ARGS("Sync", "readCommand", {"name", cmd.name().toStdString()}, diff --git a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp index 9341d39a454..78a0417b82f 100644 --- a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp +++ b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp @@ -38,7 +38,7 @@ void TestConnectionManager::writeCommand(const QVariant &command) void TestConnectionManager::dispatchCommand(const QVariant &command, Connection &connection) { - static const int synchronizeCommandType = QMetaType::type("SynchronizeCommand"); + static const int synchronizeCommandType = QMetaType::fromName("SynchronizeCommand").id(); if (command.typeId() == synchronizeCommandType) { SynchronizeCommand synchronizeCommand = command.value();