1 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
index 769a96ac64..7df085df7c 100644
--- a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
+++ b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
@@ -103,7 +103,7 @@ static QByteArray prettyList(const T &items)
         first = false;
         result += prettyPair(it);
     }
-    result += ")";
+    result += QLatin1Char(')');
     return result.toLocal8Bit();
 }
 
@@ -176,20 +176,20 @@ void tst_QUrlQuery::constructing()
         QUrlQuery copy(empty);
         QVERIFY(copy.isEmpty());
         QVERIFY(!copy.isDetached());
-        QVERIFY(copy == empty);
+        QCOMPARE(copy, empty);
         QCOMPARE(qHash(copy), qHash(empty));
         QVERIFY(!(copy != empty));
 
         copy = empty;
-        QVERIFY(copy == empty);
+        QCOMPARE(copy, empty);
 
         copy = QUrlQuery();
-        QVERIFY(copy == empty);
+        QCOMPARE(copy, empty);
         QCOMPARE(qHash(copy), qHash(empty));
     }
     {
         QUrlQuery copy(emptyQuery());
-        QVERIFY(copy == empty);
+        QCOMPARE(copy, empty);
     }
 
     QVERIFY(!empty.hasQueryItem("a"));
@@ -214,7 +214,7 @@ void tst_QUrlQuery::constructing()
     QVERIFY(!(other == empty));
 
     QUrlQuery copy(other);
-    QVERIFY(copy == other);
+    QCOMPARE(copy, other);
 
     copy.clear();
     QVERIFY(copy.isEmpty());
@@ -222,7 +222,7 @@ void tst_QUrlQuery::constructing()
 
     copy = other;
     QVERIFY(!copy.isEmpty());
-    QVERIFY(copy == other);
+    QCOMPARE(copy, other);
 
     copy = QUrlQuery();
     QVERIFY(copy.isEmpty());
@@ -298,7 +298,7 @@ void tst_QUrlQuery::addRemove()
         QCOMPARE(allItems.at(0).first, QString("a"));
         QCOMPARE(allItems.at(0).second, QString("b"));
 
-        QVERIFY(query == original);
+        QCOMPARE(query, original);
         QVERIFY(!(query != original));
         QCOMPARE(qHash(query), qHash(original));
     }
@@ -346,7 +346,7 @@ void tst_QUrlQuery::multiAddRemove()
         QVERIFY(query.hasQueryItem("a"));
 
         // returns the first one
-        QVERIFY(query.queryItemValue("a") == "b");
+        QCOMPARE(query.queryItemValue("a"), QLatin1String("b"));
 
         // order is the order we set them in
         QVERIFY(query.allQueryItemValues("a") == QStringList() << "b" << "c");
@@ -359,9 +359,9 @@ void tst_QUrlQuery::multiAddRemove()
         QVERIFY(query.hasQueryItem("A"));
         QVERIFY(query.hasQueryItem("a"));
 
-        QVERIFY(query.queryItemValue("a") == "b");
+        QCOMPARE(query.queryItemValue("a"), QLatin1String("b"));
         QVERIFY(query.allQueryItemValues("a") == QStringList() << "b" << "c");
-        QVERIFY(query.queryItemValue("A") == "B");
+        QCOMPARE(query.queryItemValue("A"), QLatin1String("B"));
         QVERIFY(query.allQueryItemValues("A") == QStringList() << "B" << "C");
     }
 
@@ -371,7 +371,7 @@ void tst_QUrlQuery::multiAddRemove()
         QVERIFY(query.hasQueryItem("a"));
 
         // it must have removed the first one
-        QVERIFY(query.queryItemValue("a") == "c");
+        QCOMPARE(query.queryItemValue("a"), QLatin1String("c"));
     }
 
     {
@@ -720,7 +720,7 @@ void tst_QUrlQuery::old_queryItems()
     QVERIFY(!url.isEmpty());
 
     QList<QPair<QString, QString> > setItems = url.queryItems();
-    QVERIFY(newItems == setItems);
+    QCOMPARE(newItems, setItems);
 
     url.addQueryItem("1", "z");
 
@@ -746,18 +746,18 @@ void tst_QUrlQuery::old_queryItems()
     url.removeAllQueryItems("1");
     QVERIFY(!url.hasQueryItem("1"));
 
-    QCOMPARE(url.queryItemValue("4").toLatin1().constData(), "a b");
-    QCOMPARE(url.queryItemValue("5").toLatin1().constData(), "&");
-    QCOMPARE(url.queryItemValue("tex").toLatin1().constData(), "a + b = c");
-    QCOMPARE(url.queryItemValue("foo bar").toLatin1().constData(), "hello world");
+    QCOMPARE(url.queryItemValue("4"), QLatin1String("a b"));
+    QCOMPARE(url.queryItemValue("5"), QLatin1String("&"));
+    QCOMPARE(url.queryItemValue("tex"), QLatin1String("a + b = c"));
+    QCOMPARE(url.queryItemValue("foo bar"), QLatin1String("hello world"));
 
     //url.setUrl("http://www.google.com/search?q=a+b");
     url.setQuery("q=a+b");
-    QCOMPARE(url.queryItemValue("q"), QString("a+b"));
+    QCOMPARE(url.queryItemValue("q"), QLatin1String("a+b"));
 
     //url.setUrl("http://www.google.com/search?q=a=b"); // invalid, but should be tolerated
     url.setQuery("q=a=b");
-    QCOMPARE(url.queryItemValue("q"), QString("a=b"));
+    QCOMPARE(url.queryItemValue("q"), QLatin1String("a=b"));
 }
 
 void tst_QUrlQuery::old_hasQueryItem_data()