qt6: Do not use QVariant::type()

...and use QVariant::userType() instead since type() method was
deprecated (variant.metaType().id() or variant.typeId() or
variant.userType() should be user instead).

Change-Id: I00b93c5e010a0c7b733b3c6dfeae2d744be32ce1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

13 files changed, 33 insertions, 33 deletions

diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index c378fbea4..6af7798f3 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -994,7 +994,7 @@ static QString mapToString(const QVariantMap &map, const QString &prefix)
     QString stringRep;
     for (const QString &key : qAsConst(keys)) {
         const QVariant &val = map.value(key);
-        if (val.type() == QVariant::Map) {
+        if (val.userType() == QVariant::Map) {
             stringRep += mapToString(val.value<QVariantMap>(), prefix + key + QLatin1Char('.'));
         } else {
             stringRep += QStringLiteral("%1%2: %3\n")
diff --git a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
index f1bf8db13..e875866a7 100644
--- a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
+++ b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
@@ -53,7 +53,7 @@ static QScriptValue toScriptValue(ScriptEngine *engine, const QString &productNa
     QScriptValue obj = engine->newObject();
     bool objIdAddedToObserver = false;
     for (auto it = v.begin(); it != v.end(); ++it) {
-        if (it.value().type() == QVariant::Map) {
+        if (it.value().userType() == QVariant::Map) {
             obj.setProperty(it.key(), toScriptValue(engine, productName, it.value().toMap(),
                     depName, QualifiedId(moduleName) << it.key()));
         } else {
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index a119e067a..9eed7c715 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -156,7 +156,7 @@ void AbstractCommand::applyCommandProperties(const QScriptValue *scriptValue)
         if (m_predefinedProperties.contains(it.name()))
             continue;
         const QVariant value = it.value().toVariant();
-        if (QMetaType::Type(value.type()) == QMetaType::QObjectStar
+        if (QMetaType::Type(value.userType()) == QMetaType::QObjectStar
                 || it.value().scriptClass()
                 || it.value().data().isValid()) {
             throw ErrorInfo(Tr::tr("Property '%1' has a type unsuitable for storing in a command "
diff --git a/src/lib/corelib/jsextensions/propertylistutils.mm b/src/lib/corelib/jsextensions/propertylistutils.mm
index b8ae1b8e0..6d039661d 100644
--- a/src/lib/corelib/jsextensions/propertylistutils.mm
+++ b/src/lib/corelib/jsextensions/propertylistutils.mm
@@ -127,33 +127,33 @@ static NSArray *toArray(const QVariantList &list);
 
 static id toObject(const QVariant &variant)
 {
-    if (variant.type() == QVariant::Hash) {
+    if (variant.userType() == QVariant::Hash) {
         return toDictionary(qHashToMap(variant.toHash()));
-    } else if (variant.type() == QVariant::Map) {
+    } else if (variant.userType() == QVariant::Map) {
         return toDictionary(variant.toMap());
-    } else if (variant.type() == QVariant::List) {
+    } else if (variant.userType() == QVariant::List) {
         return toArray(variant.toList());
-    } else if (variant.type() == QVariant::String) {
+    } else if (variant.userType() == QVariant::String) {
         return variant.toString().toNSString();
-    } else if (variant.type() == QVariant::ByteArray) {
+    } else if (variant.userType() == QVariant::ByteArray) {
         return variant.toByteArray().toNSData();
-    } else if (variant.type() == QVariant::Date ||
-               variant.type() == QVariant::DateTime) {
+    } else if (variant.userType() == QVariant::Date ||
+               variant.userType() == QVariant::DateTime) {
         return variant.toDateTime().toNSDate();
-    } else if (variant.type() == QVariant::Bool) {
+    } else if (variant.userType() == QVariant::Bool) {
         return variant.toBool()
                 ? [NSNumber numberWithBool:YES]
                 : [NSNumber numberWithBool:NO];
-    } else if (variant.type() == QVariant::Char ||
-               variant.type() == QVariant::Int) {
+    } else if (variant.userType() == QVariant::Char ||
+               variant.userType() == QVariant::Int) {
         return [NSNumber numberWithInt:variant.toInt()];
-    } else if (variant.type() == QVariant::UInt) {
+    } else if (variant.userType() == QVariant::UInt) {
         return [NSNumber numberWithUnsignedInt:variant.toUInt()];
-    } else if (variant.type() == QVariant::LongLong) {
+    } else if (variant.userType() == QVariant::LongLong) {
         return [NSNumber numberWithLongLong:variant.toLongLong()];
-    } else if (variant.type() == QVariant::ULongLong) {
+    } else if (variant.userType() == QVariant::ULongLong) {
         return [NSNumber numberWithUnsignedLongLong:variant.toULongLong()];
-    } else if (variant.type() == QVariant::Double) {
+    } else if (variant.userType() == QVariant::Double) {
         return [NSNumber numberWithDouble:variant.toDouble()];
     } else {
         return [NSNull null];
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 325045149..241670124 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1544,7 +1544,7 @@ private:
     void check(const QVariantMap &parameters, const QualifiedId &moduleName) const
     {
         for (auto it = parameters.begin(); it != parameters.end(); ++it) {
-            if (it.value().type() == QVariant::Map) {
+            if (it.value().userType() == QVariant::Map) {
                 check(it.value().toMap(), QualifiedId(moduleName) << it.key());
             } else {
                 const auto &deps = m_productItem->modules();
@@ -1942,7 +1942,7 @@ void ModuleLoader::printProfilingInfo()
 static void mergeParameters(QVariantMap &dst, const QVariantMap &src)
 {
     for (auto it = src.begin(); it != src.end(); ++it) {
-        if (it.value().type() == QVariant::Map) {
+        if (it.value().userType() == QVariant::Map) {
             QVariant &vdst = dst[it.key()];
             QVariantMap mdst = vdst.toMap();
             mergeParameters(mdst, it.value().toMap());
@@ -3243,7 +3243,7 @@ static QVariant convertToPropertyType(const QVariant &v, PropertyDeclaration::Ty
         return v;
 
     // Handle the foo,bar,bla stringlist syntax.
-    if (t == PropertyDeclaration::StringList && v.type() == QVariant::String)
+    if (t == PropertyDeclaration::StringList && v.userType() == QVariant::String)
         return v.toString().split(QLatin1Char(','));
 
     QVariant c = v;
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index da60d7b4f..4ae5f3ca7 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -900,7 +900,7 @@ void ProjectResolver::adaptExportedPropertyValues(const Item *shadowProductItem)
     const std::function<QVariant(const QVariantMap &, const QVariant &)> mapper
             = [&stringListMapper, &mapper](
             const QVariantMap &mappings, const QVariant &value) -> QVariant {
-        switch (static_cast<QMetaType::Type>(value.type())) {
+        switch (static_cast<QMetaType::Type>(value.userType())) {
         case QMetaType::QString:
             return stringMapper(mappings, value.toString());
         case QMetaType::QStringList:
diff --git a/src/lib/corelib/language/value.cpp b/src/lib/corelib/language/value.cpp
index b3e782519..16326f521 100644
--- a/src/lib/corelib/language/value.cpp
+++ b/src/lib/corelib/language/value.cpp
@@ -189,7 +189,7 @@ VariantValuePtr VariantValue::create(const QVariant &v)
 {
     if (!v.isValid())
         return invalidValue();
-    if (static_cast<QMetaType::Type>(v.type()) == QMetaType::Bool)
+    if (static_cast<QMetaType::Type>(v.userType()) == QMetaType::Bool)
         return v.toBool() ? VariantValue::trueValue() : VariantValue::falseValue();
     return std::make_shared<VariantValue>(v);
 }
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index 2ed29c4c2..4b5f652e1 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -163,7 +163,7 @@ LogWriter operator<<(LogWriter w, const Internal::Set<QString> &strSet)
 LogWriter operator<<(LogWriter w, const QVariant &variant)
 {
     QString str = QLatin1String(variant.typeName()) + QLatin1Char('(');
-    if (variant.type() == QVariant::List) {
+    if (variant.userType() == QVariant::List) {
         bool firstLoop = true;
         const auto list = variant.toList();
         for (const QVariant &item : list) {
diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp
index 69d170336..86d5324f3 100644
--- a/src/lib/corelib/tools/jsliterals.cpp
+++ b/src/lib/corelib/tools/jsliterals.cpp
@@ -75,7 +75,7 @@ QString toJSLiteral(const QVariant &val)
 {
     if (!val.isValid())
         return Internal::StringConstants::undefinedValue();
-    if (val.type() == QVariant::List || val.type() == QVariant::StringList) {
+    if (val.userType() == QVariant::List || val.userType() == QVariant::StringList) {
         QString res;
         const auto list = val.toList();
         for (const QVariant &child : list) {
@@ -86,7 +86,7 @@ QString toJSLiteral(const QVariant &val)
         res.append(QLatin1Char(']'));
         return res;
     }
-    if (val.type() == QVariant::Map) {
+    if (val.userType() == QVariant::Map) {
         const QVariantMap &vm = val.toMap();
         QString str = QStringLiteral("{");
         for (QVariantMap::const_iterator it = vm.begin(); it != vm.end(); ++it) {
@@ -97,7 +97,7 @@ QString toJSLiteral(const QVariant &val)
         str += QLatin1Char('}');
         return str;
     }
-    if (val.type() == QVariant::Bool)
+    if (val.userType() == QVariant::Bool)
         return toJSLiteral(val.toBool());
     if (val.canConvert(QVariant::String))
         return toJSLiteral(val.toString());
diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index ae57fdda4..7c4458b5f 100644
--- a/src/lib/corelib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
@@ -140,7 +140,7 @@ void PersistentPool::finalizeWriteStream()
 
 void PersistentPool::storeVariant(const QVariant &variant)
 {
-    const auto type = static_cast<quint32>(variant.type());
+    const auto type = static_cast<quint32>(variant.userType());
     m_stream << type;
     switch (type) {
     case QMetaType::QString:
diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp
index fccb9c9b2..8b22c45e5 100644
--- a/src/lib/corelib/tools/settings.cpp
+++ b/src/lib/corelib/tools/settings.cpp
@@ -117,9 +117,9 @@ QVariant Settings::value(const QString &key, Scopes scopes, const QVariant &defa
     }
     if (!systemValue.isValid())
         return userValue;
-    if (static_cast<QMetaType::Type>(userValue.type()) == QMetaType::QStringList)
+    if (static_cast<QMetaType::Type>(userValue.userType()) == QMetaType::QStringList)
         return userValue.toStringList() + systemValue.toStringList();
-    if (static_cast<QMetaType::Type>(userValue.type()) == QMetaType::QVariantList)
+    if (static_cast<QMetaType::Type>(userValue.userType()) == QMetaType::QVariantList)
         return userValue.toList() + systemValue.toList();
     return userValue;
 }
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp
index 36e67440c..618098fbf 100644
--- a/src/lib/corelib/tools/settingscreator.cpp
+++ b/src/lib/corelib/tools/settingscreator.cpp
@@ -109,11 +109,11 @@ void SettingsCreator::migrate()
     const auto allKeys = m_settings->allKeys();
     for (const QString &key : allKeys) {
         QVariant v = m_settings->value(key);
-        if (v.type() == QVariant::String) {
+        if (v.userType() == QVariant::String) {
             QString s = v.toString();
             if (s.contains(oldProfilesDir))
                 m_settings->setValue(key, s.replace(oldProfilesDir, newProfilesDir));
-        } else if (v.type() == QVariant::StringList) {
+        } else if (v.userType() == QVariant::StringList) {
             const QStringList oldList = v.toStringList();
             QStringList newList;
             for (const QString &oldString : oldList) {
diff --git a/src/lib/corelib/tools/settingsrepresentation.cpp b/src/lib/corelib/tools/settingsrepresentation.cpp
index 256c60c0e..7790f1aa1 100644
--- a/src/lib/corelib/tools/settingsrepresentation.cpp
+++ b/src/lib/corelib/tools/settingsrepresentation.cpp
@@ -67,8 +67,8 @@ QVariant representationToSettingsValue(const QString &representation)
     QVariant variant = variantFromString(representation, ok);
 
     // We have no floating-point properties, so this is most likely intended to be a string.
-    if (static_cast<QMetaType::Type>(variant.type()) == QMetaType::Float
-            || static_cast<QMetaType::Type>(variant.type()) == QMetaType::Double) {
+    if (static_cast<QMetaType::Type>(variant.userType()) == QMetaType::Float
+            || static_cast<QMetaType::Type>(variant.userType()) == QMetaType::Double) {
         variant = variantFromString(QLatin1Char('"') + representation + QLatin1Char('"'), ok);
     }