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>

5 files changed, 23 insertions, 23 deletions

diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index 928dc48125..25764aacce 100644
--- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -282,21 +282,21 @@ void tst_QNetworkRequest::setHeader_data()
     cookie.setName("a");
     cookie.setValue("b");
     QTest::newRow("Cookie-1") << QNetworkRequest::CookieHeader
-                              << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                              << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                               << true << "Cookie"
                               << "a=b";
     QTest::newRow("SetCookie-1") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                                  << true << "Set-Cookie"
                                  << "a=b";
 
     cookie.setPath("/");
     QTest::newRow("Cookie-2") << QNetworkRequest::CookieHeader
-                              << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                              << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                               << true << "Cookie"
                               << "a=b";
     QTest::newRow("SetCookie-2") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                                  << true << "Set-Cookie"
                                  << "a=b; path=/";
 
@@ -304,11 +304,11 @@ void tst_QNetworkRequest::setHeader_data()
     cookie2.setName("c");
     cookie2.setValue("d");
     QTest::newRow("Cookie-3") << QNetworkRequest::CookieHeader
-                              << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2)
+                              << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2)
                               << true << "Cookie"
                               << "a=b; c=d";
     QTest::newRow("SetCookie-3") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2)
                                  << true << "Set-Cookie"
                                  << "a=b; path=/, c=d";
 }
@@ -388,17 +388,17 @@ void tst_QNetworkRequest::rawHeaderParsing_data()
     cookie.setName("a");
     cookie.setValue("b");
     QTest::newRow("Cookie-1") << QNetworkRequest::CookieHeader
-                              << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                              << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                               << true << "Cookie"
                               << "a=b";
     QTest::newRow("SetCookie-1") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                                  << true << "Set-Cookie"
                                  << "a=b";
 
     cookie.setPath("/");
     QTest::newRow("SetCookie-2") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie)
                                  << true << "Set-Cookie"
                                  << "a=b; path=/";
 
@@ -407,12 +407,12 @@ void tst_QNetworkRequest::rawHeaderParsing_data()
     cookie2.setName("c");
     cookie2.setValue("d");
     QTest::newRow("Cookie-3") << QNetworkRequest::CookieHeader
-                              << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2)
+                              << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2)
                               << true << "Cookie"
                               << "a=b; c=d";
     cookie.setPath("/");
     QTest::newRow("SetCookie-3") << QNetworkRequest::SetCookieHeader
-                                 << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2)
+                                 << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2)
                                  << true << "Set-Cookie"
                                  << "a=b; path=/, c=d";
 }
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 1f531f387c..eeda46dfdc 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -383,7 +383,7 @@ void tst_QLocalSocket::listenAndConnect()
             QVERIFY(socket->error() != QLocalSocket::UnknownSocketError);
             QCOMPARE(socket->state(), QLocalSocket::UnconnectedState);
             //QVERIFY(socket->socketDescriptor() == -1);
-            QCOMPARE(qVariantValue<QLocalSocket::LocalSocketError>(spyError.first()[0]),
+            QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketError>(spyError.first()[0]),
                      QLocalSocket::ServerNotFoundError);
         }
 
@@ -403,19 +403,19 @@ void tst_QLocalSocket::listenAndConnect()
         QVERIFY(spyError.count() >= 0);
         if (canListen) {
             if (spyError.count() > 0)
-                QCOMPARE(qVariantValue<QLocalSocket::LocalSocketError>(spyError.first()[0]),
+                QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketError>(spyError.first()[0]),
                          QLocalSocket::SocketTimeoutError);
         } else {
-            QCOMPARE(qVariantValue<QLocalSocket::LocalSocketError>(spyError.first()[0]),
+            QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketError>(spyError.first()[0]),
                      QLocalSocket::ServerNotFoundError);
         }
 
         // Check first and last state
-        QCOMPARE(qVariantValue<QLocalSocket::LocalSocketState>(spyStateChanged.first()[0]),
+        QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketState>(spyStateChanged.first()[0]),
                  QLocalSocket::ConnectingState);
 
         if (canListen)
-            QCOMPARE(qVariantValue<QLocalSocket::LocalSocketState>(spyStateChanged.last()[0]),
+            QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketState>(spyStateChanged.last()[0]),
                      QLocalSocket::ConnectedState);
         QCOMPARE(spyStateChanged.count(), 2);
         QCOMPARE(spyReadyRead.count(), 0);
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index a3e5366e41..3cc1f32622 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -130,7 +130,7 @@ private slots:
     {
         QTcpSocket *client = nextPendingConnection();
         connect(client, SIGNAL(readyRead()), SLOT(handleClientCommand()));
-        client->setProperty("pendingResponses", qVariantFromValue(responses));
+        client->setProperty("pendingResponses", QVariant::fromValue(responses));
     }
 
     void handleClientCommand()
@@ -145,7 +145,7 @@ private slots:
             client->disconnectFromHost();
         else
             client->write(pendingResponses.dequeue());
-        client->setProperty("pendingResponses", qVariantFromValue(pendingResponses));
+        client->setProperty("pendingResponses", QVariant::fromValue(pendingResponses));
     }
 };
 
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 3c7c3a3da0..13c5d961d7 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -2212,9 +2212,9 @@ void tst_QTcpSocket::connectionRefused()
     QCOMPARE(socket->error(), QAbstractSocket::ConnectionRefusedError);
 
     QCOMPARE(stateSpy.count(), 3);
-    QCOMPARE(qVariantValue<QAbstractSocket::SocketState>(stateSpy.at(0).at(0)), QAbstractSocket::HostLookupState);
-    QCOMPARE(qVariantValue<QAbstractSocket::SocketState>(stateSpy.at(1).at(0)), QAbstractSocket::ConnectingState);
-    QCOMPARE(qVariantValue<QAbstractSocket::SocketState>(stateSpy.at(2).at(0)), QAbstractSocket::UnconnectedState);
+    QCOMPARE(qvariant_cast<QAbstractSocket::SocketState>(stateSpy.at(0).at(0)), QAbstractSocket::HostLookupState);
+    QCOMPARE(qvariant_cast<QAbstractSocket::SocketState>(stateSpy.at(1).at(0)), QAbstractSocket::ConnectingState);
+    QCOMPARE(qvariant_cast<QAbstractSocket::SocketState>(stateSpy.at(2).at(0)), QAbstractSocket::UnconnectedState);
     QCOMPARE(errorSpy.count(), 1);
 
     delete socket;
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 6f81829e25..34bc361e4b 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1793,8 +1793,8 @@ void tst_QSslSocket::peerVerifyError()
     QVERIFY(!socket->waitForEncrypted(10000));
     QVERIFY(!peerVerifyErrorSpy.isEmpty());
     QVERIFY(!sslErrorsSpy.isEmpty());
-    QCOMPARE(qVariantValue<QSslError>(peerVerifyErrorSpy.last().at(0)).error(), QSslError::HostNameMismatch);
-    QCOMPARE(qVariantValue<QList<QSslError> >(sslErrorsSpy.at(0).at(0)).size(), peerVerifyErrorSpy.size());
+    QCOMPARE(qvariant_cast<QSslError>(peerVerifyErrorSpy.last().at(0)).error(), QSslError::HostNameMismatch);
+    QCOMPARE(qvariant_cast<QList<QSslError> >(sslErrorsSpy.at(0).at(0)).size(), peerVerifyErrorSpy.size());
 }
 
 void tst_QSslSocket::disconnectFromHostWhenConnecting()