Deprecate QVariant::Type

It's been obsolete for a long time already. Make sure
the compiler now warns about it and remove all remaining
uses in qtbase.

Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

7 files changed, 43 insertions, 35 deletions

diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 29c1a4c9e0..60904f7ebc 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -721,11 +721,11 @@ void tst_QSettings::embeddedZeroByte()
         QSettings settings("QtProject", "tst_qsettings");
         QVariant outValue = settings.value(QTest::currentDataTag());
 
-        switch (value.type()) {
-        case QVariant::ByteArray:
+        switch (value.typeId()) {
+        case QMetaType::QByteArray:
             QCOMPARE(outValue.toByteArray(), value.toByteArray());
             break;
-        case QVariant::String:
+        case QMetaType::QString:
             QCOMPARE(outValue.toString(), value.toString());
             break;
         default:
@@ -932,9 +932,9 @@ void tst_QSettings::testIniParsing()
         if (expect.isValid())
             QVERIFY(v.canConvert(expect.type()));
         // check some types so as to give prettier error messages
-        if ( v.type() == QVariant::String ) {
+        if ( v.typeId() == QMetaType::QString ) {
             QCOMPARE(v.toString(), expect.toString());
-        } else if ( v.type() == QVariant::Int ) {
+        } else if ( v.typeId() == QMetaType::Int ) {
             QCOMPARE(v.toInt(), expect.toInt());
         } else {
             QCOMPARE(v, expect);
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 267d218cf0..78749559b5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -1609,16 +1609,16 @@ void tst_QSortFilterProxyModel::removeSourceRows()
     QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count());
     for (int i = 0; i < aboutToRemoveSpy.count(); ++i) {
         const auto &args = aboutToRemoveSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
     }
     QCOMPARE(removeSpy.count(), expectedRemovedProxyIntervals.count());
     for (int i = 0; i < removeSpy.count(); ++i) {
         const auto &args = removeSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
     }
@@ -1787,8 +1787,8 @@ void tst_QSortFilterProxyModel::changeFilter()
     QCOMPARE(initialInsertSpy.count(), 0);
     for (int i = 0; i < initialRemoveSpy.count(); ++i) {
         const auto &args = initialRemoveSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), initialRemoveIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), initialRemoveIntervals.at(i).second);
     }
@@ -1810,8 +1810,8 @@ void tst_QSortFilterProxyModel::changeFilter()
     QCOMPARE(finalRemoveSpy.count(), finalRemoveIntervals.count());
     for (int i = 0; i < finalRemoveSpy.count(); ++i) {
         const auto &args = finalRemoveSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), finalRemoveIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), finalRemoveIntervals.at(i).second);
     }
@@ -1819,8 +1819,8 @@ void tst_QSortFilterProxyModel::changeFilter()
     QCOMPARE(finalInsertSpy.count(), insertIntervals.count());
     for (int i = 0; i < finalInsertSpy.count(); ++i) {
         const auto &args = finalInsertSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), insertIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), insertIntervals.at(i).second);
     }
@@ -2025,8 +2025,8 @@ void tst_QSortFilterProxyModel::changeSourceData()
     QCOMPARE(removeSpy.count(), removeIntervals.count());
     for (int i = 0; i < removeSpy.count(); ++i) {
         const auto &args = removeSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), removeIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), removeIntervals.at(i).second);
     }
@@ -2034,8 +2034,8 @@ void tst_QSortFilterProxyModel::changeSourceData()
     QCOMPARE(insertSpy.count(), insertIntervals.count());
     for (int i = 0; i < insertSpy.count(); ++i) {
         const auto &args = insertSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), insertIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), insertIntervals.at(i).second);
     }
@@ -4606,16 +4606,16 @@ void tst_QSortFilterProxyModel::removeIntervals()
     QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count());
     for (int i = 0; i < aboutToRemoveSpy.count(); ++i) {
         const auto &args = aboutToRemoveSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
     }
     QCOMPARE(removeSpy.count(), expectedRemovedProxyIntervals.count());
     for (int i = 0; i < removeSpy.count(); ++i) {
         const auto &args = removeSpy.at(i);
-        QCOMPARE(args.at(1).type(), QVariant::Int);
-        QCOMPARE(args.at(2).type(), QVariant::Int);
+        QCOMPARE(args.at(1).userType(), QMetaType::Int);
+        QCOMPARE(args.at(2).userType(), QMetaType::Int);
         QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
         QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
     }
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 08219d45d2..dca4f0fea5 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -1447,7 +1447,15 @@ void tst_QMetaObject::customPropertyType()
 {
     QMetaProperty prop = metaObject()->property(metaObject()->indexOfProperty("value3"));
 
+#if QT_DEPRECATED_SINCE(6, 0)
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
+
     QCOMPARE(prop.type(), QVariant::UserType);
+
+    QT_WARNING_POP
+#endif
+
     QCOMPARE(prop.userType(), QMetaType::fromType<MyStruct>().id());
     QCOMPARE(prop.metaType(), QMetaType::fromType<MyStruct>());
 
@@ -1455,11 +1463,11 @@ void tst_QMetaObject::customPropertyType()
     QCOMPARE(prop.userType(), QMetaType::fromName("MyStruct").id());
 
     prop = metaObject()->property(metaObject()->indexOfProperty("value4"));
-    QCOMPARE(prop.type(), QVariant::List);
+    QCOMPARE(prop.metaType().id(), QMetaType::QVariantList);
     QCOMPARE(prop.metaType(), QMetaType::fromType<QList<QVariant>>());
 
     prop = metaObject()->property(metaObject()->indexOfProperty("value5"));
-    QCOMPARE(prop.type(), QVariant::List);
+    QCOMPARE(prop.metaType().id(), QMetaType::QVariantList);
 }
 
 void tst_QMetaObject::checkScope_data()
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 33daaea759..2660c1a53c 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -749,7 +749,7 @@ void tst_QMetaObjectBuilder::variantProperty()
     QMetaObject *meta = builder.toMetaObject();
 
     QMetaProperty prop = meta->property(meta->propertyOffset());
-    QCOMPARE(QMetaType::Type(prop.type()), QMetaType::QVariant);
+    QCOMPARE(QMetaType::Type(prop.userType()), QMetaType::QVariant);
     QCOMPARE(QMetaType::Type(prop.userType()), QMetaType::QVariant);
     QCOMPARE(QByteArray(prop.typeName()), QByteArray("QVariant"));
 
@@ -1582,7 +1582,7 @@ void tst_QMetaObjectBuilder::usage_property()
     QScopedPointer<TestObject> testObject(new TestObject);
 
     QVariant prop = testObject->property("intProp");
-    QCOMPARE(prop.type(), QVariant::Int);
+    QCOMPARE(prop.metaType(), QMetaType(QMetaType::Int));
     QCOMPARE(prop.toInt(), testObject->intProp());
 
     QSignalSpy propChangedSpy(testObject.data(), &TestObject::intPropChanged);
@@ -1590,7 +1590,7 @@ void tst_QMetaObjectBuilder::usage_property()
     testObject->setProperty("intProp", 123);
     QCOMPARE(propChangedSpy.count(), 1);
     prop = testObject->property("intProp");
-    QCOMPARE(prop.type(), QVariant::Int);
+    QCOMPARE(prop.metaType(), QMetaType(QMetaType::Int));
     QCOMPARE(prop.toInt(), 123);
 }
 
@@ -1618,9 +1618,9 @@ void tst_QMetaObjectBuilder::usage_method()
     QVERIFY(listInvokableQRealQString.invoke(testObject.data(), Q_RETURN_ARG(QVariantList, list),
                                              Q_ARG(qreal, 123.0), Q_ARG(QString, "ciao")));
     QCOMPARE(list.size(), 2);
-    QCOMPARE(list.at(0).type(), QVariant::Type(QMetaType::QReal));
+    QCOMPARE(list.at(0).metaType(), QMetaType(QMetaType::QReal));
     QCOMPARE(list.at(0).toDouble(), double(123));
-    QCOMPARE(list.at(1).type(), QVariant::String);
+    QCOMPARE(list.at(1).metaType(), QMetaType(QMetaType::QString));
     QCOMPARE(list.at(1).toString(), QString::fromLatin1("ciao"));
 }
 
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index 8563804ff8..6ebf4a7c33 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
@@ -451,7 +451,7 @@ void tst_QUuid::qvariant()
     QUuid uuid = QUuid::createUuid();
     QVariant v = QVariant::fromValue(uuid);
     QVERIFY(!v.isNull());
-    QCOMPARE(v.type(), QVariant::Uuid);
+    QCOMPARE(v.metaType(), QMetaType(QMetaType::QUuid));
 
     QUuid uuid2 = v.value<QUuid>();
     QVERIFY(!uuid2.isNull());
@@ -478,14 +478,14 @@ void tst_QUuid::qvariant_conversion()
 
     // try reverse conversion QString -> QUuid
     QVariant sv = QVariant::fromValue(uuid.toString());
-    QCOMPARE(sv.type(), QVariant::String);
+    QCOMPARE(sv.metaType(), QMetaType(QMetaType::QString));
     QVERIFY(sv.canConvert<QUuid>());
     QCOMPARE(sv.value<QUuid>(), uuid);
 
     // QString -> QUuid
     {
         QVariant sv = QVariant::fromValue(uuid.toByteArray());
-        QCOMPARE(sv.type(), QVariant::ByteArray);
+        QCOMPARE(sv.metaType(), QMetaType(QMetaType::QByteArray));
         QVERIFY(sv.canConvert<QUuid>());
         QCOMPARE(sv.value<QUuid>(), uuid);
     }
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
index 3252919c4c..9324459512 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -224,7 +224,7 @@ void tst_QCborValue_Json::fromVariant()
     QCOMPARE(QCborArray::fromVariantList({variant}), QCborArray{v});
     QCOMPARE(QCborArray::fromVariantList({variant, variant}), QCborArray({v, v}));
 
-    if (variant.type() == QVariant::String) {
+    if (variant.metaType() == QMetaType(QMetaType::QString)) {
         QString s = variant.toString();
         QCOMPARE(QCborArray::fromStringList({s}), QCborArray{v});
         QCOMPARE(QCborArray::fromStringList({s, s}), QCborArray({v, v}));
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index 0710e257b8..7249e2a6d8 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -578,7 +578,7 @@ void tst_QDataStream::readQRegularExpression(QDataStream *s)
     *s >> R;
     QCOMPARE(R, test);
     *s >> V;
-    QCOMPARE(V.type(), QVariant::RegularExpression);
+    QCOMPARE(V.userType(), QMetaType::QRegularExpression);
     QCOMPARE(V.toRegularExpression(), test);
 }
 #endif //QT_CONFIG(regularexpression)