From e7e7540aecc5a4a44f1d1a25e58ccbcf662cbe24 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 27 Jul 2020 17:00:22 +0200
Subject: Deprecate int based convert/canConvert

Better to provide the correct meta type to convert to.

Change-Id: I8e0d46e4ba482186201c157e302c03874bd38e7b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp      |  4 ++--
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp        | 14 +++++++-------
 .../serialization/qcborvalue_json/tst_qcborvalue_json.cpp  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests/auto/corelib')

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 49f9be0ce2..42d8d37583 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -2331,14 +2331,14 @@ template<typename From, typename To>
 void testCustomTypeNotYetConvertible()
 {
     QVERIFY((!hasRegisteredConverterFunction<From, To>()));
-    QVERIFY((!QVariant::fromValue<From>(From()).canConvert(qMetaTypeId<To>())));
+    QVERIFY((!QVariant::fromValue<From>(From()).template canConvert<To>()));
 }
 
 template<typename From, typename To>
 void testCustomTypeConvertible()
 {
     QVERIFY((hasRegisteredConverterFunction<From, To>()));
-    QVERIFY((QVariant::fromValue<From>(From()).canConvert(qMetaTypeId<To>())));
+    QVERIFY((QVariant::fromValue<From>(From()).template canConvert<To>()));
 }
 
 void customTypeNotYetConvertible()
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 1bcda67d83..b871bfcac9 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -1852,7 +1852,7 @@ void tst_QVariant::userType()
             QCOMPARE(userVar.userType(), qMetaTypeId<MyType>());
             QCOMPARE(userVar.typeName(), "MyType");
             QVERIFY(!userVar.isNull());
-            QVERIFY(!userVar.canConvert(QVariant::String));
+            QVERIFY(!userVar.canConvert<QString>());
 
             QVariant userVar2(userVar);
             QCOMPARE(userVar, userVar2);
@@ -1881,7 +1881,7 @@ void tst_QVariant::userType()
             QCOMPARE(userVar.userType(), qMetaTypeId<MyType*>());
             QCOMPARE(userVar.typeName(), "MyType*");
             QVERIFY(!userVar.isNull());
-            QVERIFY(!userVar.canConvert(QVariant::String));
+            QVERIFY(!userVar.canConvert<QString>());
 
             QVariant userVar2(userVar);
             QCOMPARE(userVar, userVar2);
@@ -2696,7 +2696,7 @@ void tst_QVariant::canConvertQStringList() const
 
     QVariant v(input);
 
-    QCOMPARE(v.canConvert(QVariant::String), canConvert);
+    QCOMPARE(v.canConvert<QString>(), canConvert);
     QCOMPARE(v.toString(), result);
 }
 
@@ -2722,7 +2722,7 @@ void tst_QVariant::canConvertQStringList_data() const
 template<typename T> void convertMetaType()
 {
     QVERIFY(QVariant::fromValue<T>(10).isValid());
-    QVERIFY(QVariant::fromValue<T>(10).canConvert(QVariant::Int));
+    QVERIFY(QVariant::fromValue<T>(10).template canConvert<int>());
     QCOMPARE(QVariant::fromValue<T>(10).toInt(), 10);
     QCOMPARE(QVariant::fromValue<T>(10), QVariant::fromValue<T>(10));
 }
@@ -2878,7 +2878,7 @@ void tst_QVariant::compareCustomTypes() const
 void tst_QVariant::timeToDateTime() const
 {
     const QVariant val(QTime::currentTime());
-    QVERIFY(!val.canConvert(QVariant::DateTime));
+    QVERIFY(!val.canConvert<QDateTime>());
     QVERIFY(!val.toDateTime().isValid());
 }
 
@@ -3098,7 +3098,7 @@ void tst_QVariant::toIntFromDouble() const
     QCOMPARE((int)d, 2147483630);
 
     QVariant var(d);
-    QVERIFY( var.canConvert( QVariant::Int ) );
+    QVERIFY(var.canConvert<int>());
 
     bool ok;
     int result = var.toInt(&ok);
@@ -3653,7 +3653,7 @@ void tst_QVariant::userConversion()
 void tst_QVariant::modelIndexConversion()
 {
     QVariant modelIndexVariant = QModelIndex();
-    QVERIFY(modelIndexVariant.canConvert(QMetaType::QPersistentModelIndex));
+    QVERIFY(modelIndexVariant.canConvert<QPersistentModelIndex>());
     QVERIFY(modelIndexVariant.convert(QMetaType::QPersistentModelIndex));
     QCOMPARE(modelIndexVariant.type(), QVariant::PersistentModelIndex);
     QVERIFY(modelIndexVariant.canConvert(QMetaType::QModelIndex));
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 10080a66ed..3252919c4c 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -148,8 +148,8 @@ void tst_QCborValue_Json::toVariant()
     QCOMPARE(v.toVariant(), variant);
     if (variant.isValid()) {
         QVariant variant2 = QVariant::fromValue(v);
-        QVERIFY(variant2.canConvert(variant.userType()));
-        QVERIFY(variant2.convert(variant.userType()));
+        QVERIFY(variant2.canConvert(variant.metaType()));
+        QVERIFY(variant2.convert(variant.metaType()));
         QCOMPARE(variant2, variant);
     }
 
-- 
cgit v1.2.3