From 060727ed4f8b1ffea58229817640a03be5b095ed Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 10 Jun 2009 16:58:06 +0200
Subject: Adding support in QVariant for conversions between QUrl and QString

Reviewed-by: ogoffart
---
 src/corelib/kernel/qvariant.cpp      | 16 ++++++++++++++--
 tests/auto/qvariant/tst_qvariant.cpp | 14 +++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index e6f1c48..a3434a4 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -591,6 +591,15 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
         ok = &dummy;
 
     switch (uint(t)) {
+    case QVariant::Url: 
+        switch (d->type) {
+        case QVariant::String:
+            *static_cast<QUrl *>(result) = QUrl(*v_cast<QString>(d));
+            break;
+        default:
+            return false;
+        }
+        break;
     case QVariant::String: {
         QString *str = static_cast<QString *>(result);
         switch (d->type) {
@@ -640,6 +649,8 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
             if (v_cast<QStringList>(d)->count() == 1)
                 *str = v_cast<QStringList>(d)->at(0);
             break;
+        case QVariant::Url:
+            *str = v_cast<QUrl>(d)->toString();
         default:
             return false;
         }
@@ -2484,7 +2495,8 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] =
 /*QString*/       1 << QVariant::StringList | 1 << QVariant::ByteArray  | 1 << QVariant::Int
                 | 1 << QVariant::UInt       | 1 << QVariant::Bool       | 1 << QVariant::Double
                 | 1 << QVariant::Date       | 1 << QVariant::Time       | 1 << QVariant::DateTime
-                | 1 << QVariant::LongLong   | 1 << QVariant::ULongLong  | 1 << QVariant::Char,
+                | 1 << QVariant::LongLong   | 1 << QVariant::ULongLong  | 1 << QVariant::Char
+                | 1 << QVariant::Url,
 
 /*QStringList*/   1 << QVariant::List       | 1 << QVariant::String,
 
@@ -2499,7 +2511,7 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] =
 
 /*QDateTime*/     1 << QVariant::String     | 1 << QVariant::Date,
 
-/*QUrl*/          0,
+/*QUrl*/          1 << QVariant::String,
 
 /*QLocale*/       0,
 
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 0ede920..2d26914 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -2449,14 +2449,22 @@ void tst_QVariant::saveLoadCustomTypes()
 
 void tst_QVariant::url()
 {
-    QUrl url("http://www.trolltech.com");
+    QString str("http://www.trolltech.com");
+    QUrl url(str);
 
-    QVariant v(url);
+    QVariant v(url); //built with a QUrl
 
     QVariant v2 = v;
 
-    QVERIFY(v2.toUrl() == url);
+    QVariant v3(str); //built with a QString
 
+    QCOMPARE(v2.toUrl(), url);
+    QVERIFY(qVariantCanConvert<QUrl>(v3));
+    QCOMPARE(v2.toUrl(), v3.toUrl());
+
+    QVERIFY(qVariantCanConvert<QString>(v2));
+    QCOMPARE(v2.toString(), str);
+    QCOMPARE(v3.toString(), str);
 }
 
 void tst_QVariant::globalColor()
-- 
cgit v0.12