Don't use obsolete qVariantValue, qVariantCanConvert, etc.

qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.

qVariantFromValue and qVariantSetValue are Obsolete members.

Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
index d27d685f37..6a15133b27 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
@@ -535,27 +535,27 @@ void tst_QItemModel::data()
     // General Purpose roles
     QVariant variant = currentModel->data(currentModel->index(0,0), Qt::ToolTipRole);
     if (variant.isValid()) {
-        QVERIFY(qVariantCanConvert<QString>(variant));
+        QVERIFY(variant.canConvert<QString>());
     }
     variant = currentModel->data(currentModel->index(0,0), Qt::StatusTipRole);
     if (variant.isValid()) {
-        QVERIFY(qVariantCanConvert<QString>(variant));
+        QVERIFY(variant.canConvert<QString>());
     }
     variant = currentModel->data(currentModel->index(0,0), Qt::WhatsThisRole);
     if (variant.isValid()) {
-        QVERIFY(qVariantCanConvert<QString>(variant));
+        QVERIFY(variant.canConvert<QString>());
     }
 
     variant = currentModel->data(currentModel->index(0,0), Qt::SizeHintRole);
     if (variant.isValid()) {
-        QVERIFY(qVariantCanConvert<QSize>(variant));
+        QVERIFY(variant.canConvert<QSize>());
     }
 
 
     // Appearance roles
     QVariant fontVariant = currentModel->data(currentModel->index(0,0), Qt::FontRole);
     if (fontVariant.isValid()) {
-        QVERIFY(qVariantCanConvert<QFont>(fontVariant));
+        QVERIFY(fontVariant.canConvert<QFont>());
     }
 
     QVariant textAlignmentVariant = currentModel->data(currentModel->index(0,0), Qt::TextAlignmentRole);
@@ -569,12 +569,12 @@ void tst_QItemModel::data()
 
     QVariant colorVariant = currentModel->data(currentModel->index(0,0), Qt::BackgroundColorRole);
     if (colorVariant.isValid()) {
-        QVERIFY(qVariantCanConvert<QColor>(colorVariant));
+        QVERIFY(colorVariant.canConvert<QColor>());
     }
 
     colorVariant = currentModel->data(currentModel->index(0,0), Qt::TextColorRole);
     if (colorVariant.isValid()) {
-        QVERIFY(qVariantCanConvert<QColor>(colorVariant));
+        QVERIFY(colorVariant.canConvert<QColor>());
     }
 
     QVariant checkStateVariant = currentModel->data(currentModel->index(0,0), Qt::CheckStateRole);