Use QStringLiteral whereever possible

This replaces a lot of old QLatin1String cases

Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 35 insertions, 35 deletions

diff --git a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp
index ac294d6e..8f07ba29 100644
--- a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp
@@ -68,10 +68,10 @@ QPlaceSupplier parseSupplier(const QJsonObject &supplierObject,
     Q_ASSERT(engine);
 
     QPlaceSupplier supplier;
-    supplier.setName(supplierObject.value(QLatin1String("title")).toString());
-    supplier.setUrl(supplierObject.value(QLatin1String("href")).toString());
+    supplier.setName(supplierObject.value(QStringLiteral("title")).toString());
+    supplier.setUrl(supplierObject.value(QStringLiteral("href")).toString());
 
-    supplier.setIcon(engine->icon(supplierObject.value(QLatin1String("icon")).toString()));
+    supplier.setIcon(engine->icon(supplierObject.value(QStringLiteral("icon")).toString()));
 
     return supplier;
 }
@@ -83,14 +83,14 @@ QPlaceCategory parseCategory(const QJsonObject &categoryObject,
 
     QPlaceCategory category;
 
-    category.setName(categoryObject.value(QLatin1String("title")).toString());
+    category.setName(categoryObject.value(QStringLiteral("title")).toString());
 
-    const QUrl href(categoryObject.value(QLatin1String("href")).toString());
+    const QUrl href(categoryObject.value(QStringLiteral("href")).toString());
     const QString hrefPath(href.path());
     category.setCategoryId(hrefPath.mid(hrefPath.lastIndexOf(QLatin1Char('/')) + 1));
 
 
-    category.setIcon(engine->icon(categoryObject.value(QLatin1String("icon")).toString()));
+    category.setIcon(engine->icon(categoryObject.value(QStringLiteral("icon")).toString()));
     return category;
 }
 
@@ -115,8 +115,8 @@ QList<QPlaceContactDetail> parseContactDetails(const QJsonArray &contacts)
         QJsonObject contact = contacts.at(i).toObject();
 
         QPlaceContactDetail detail;
-        detail.setLabel(contact.value(QLatin1String("label")).toString());
-        detail.setValue(contact.value(QLatin1String("value")).toString());
+        detail.setLabel(contact.value(QStringLiteral("label")).toString());
+        detail.setValue(contact.value(QStringLiteral("value")).toString());
 
         contactDetails.append(detail);
     }
@@ -131,9 +131,9 @@ QPlaceImage parseImage(const QJsonObject &imageObject,
 
     QPlaceImage image;
 
-    image.setAttribution(imageObject.value(QLatin1String("attribution")).toString());
-    image.setUrl(imageObject.value(QLatin1String("src")).toString());
-    image.setSupplier(parseSupplier(imageObject.value(QLatin1String("supplier")).toObject(),
+    image.setAttribution(imageObject.value(QStringLiteral("attribution")).toString());
+    image.setUrl(imageObject.value(QStringLiteral("src")).toString());
+    image.setSupplier(parseSupplier(imageObject.value(QStringLiteral("supplier")).toObject(),
                                     engine));
 
     return image;
@@ -146,32 +146,32 @@ QPlaceReview parseReview(const QJsonObject &reviewObject,
 
     QPlaceReview review;
 
-    review.setDateTime(QDateTime::fromString(reviewObject.value(QLatin1String("date")).toString()));
+    review.setDateTime(QDateTime::fromString(reviewObject.value(QStringLiteral("date")).toString()));
 
-    if (reviewObject.contains(QLatin1String("title")))
-        review.setTitle(reviewObject.value(QLatin1String("title")).toString());
+    if (reviewObject.contains(QStringLiteral("title")))
+        review.setTitle(reviewObject.value(QStringLiteral("title")).toString());
 
-    if (reviewObject.contains(QLatin1String("rating")))
-        review.setRating(reviewObject.value(QLatin1String("rating")).toDouble());
+    if (reviewObject.contains(QStringLiteral("rating")))
+        review.setRating(reviewObject.value(QStringLiteral("rating")).toDouble());
 
-    review.setText(reviewObject.value(QLatin1String("description")).toString());
+    review.setText(reviewObject.value(QStringLiteral("description")).toString());
 
-    QJsonObject userObject = reviewObject.value(QLatin1String("user")).toObject();
+    QJsonObject userObject = reviewObject.value(QStringLiteral("user")).toObject();
 
     QPlaceUser user;
-    user.setUserId(userObject.value(QLatin1String("id")).toString());
-    user.setName(userObject.value(QLatin1String("title")).toString());
+    user.setUserId(userObject.value(QStringLiteral("id")).toString());
+    user.setName(userObject.value(QStringLiteral("title")).toString());
     review.setUser(user);
 
-    review.setAttribution(reviewObject.value(QLatin1String("attribution")).toString());
+    review.setAttribution(reviewObject.value(QStringLiteral("attribution")).toString());
 
-    review.setLanguage(reviewObject.value(QLatin1String("language")).toString());
+    review.setLanguage(reviewObject.value(QStringLiteral("language")).toString());
 
-    review.setSupplier(parseSupplier(reviewObject.value(QLatin1String("supplier")).toObject(),
+    review.setSupplier(parseSupplier(reviewObject.value(QStringLiteral("supplier")).toObject(),
                                      engine));
 
-    //if (reviewObject.contains(QLatin1String("via"))) {
-    //    QJsonObject viaObject = reviewObject.value(QLatin1String("via")).toObject();
+    //if (reviewObject.contains(QStringLiteral("via"))) {
+    //    QJsonObject viaObject = reviewObject.value(QStringLiteral("via")).toObject();
     //}
 
     return review;
@@ -184,16 +184,16 @@ QPlaceEditorial parseEditorial(const QJsonObject &editorialObject,
 
     QPlaceEditorial editorial;
 
-    editorial.setAttribution(editorialObject.value(QLatin1String("attribution")).toString());
+    editorial.setAttribution(editorialObject.value(QStringLiteral("attribution")).toString());
 
-    //if (editorialObject.contains(QLatin1String("via"))) {
-    //    QJsonObject viaObject = editorialObject.value(QLatin1String("via")).toObject();
+    //if (editorialObject.contains(QStringLiteral("via"))) {
+    //    QJsonObject viaObject = editorialObject.value(QStringLiteral("via")).toObject();
     //}
 
-    editorial.setSupplier(parseSupplier(editorialObject.value(QLatin1String("supplier")).toObject(),
+    editorial.setSupplier(parseSupplier(editorialObject.value(QStringLiteral("supplier")).toObject(),
                                         engine));
-    editorial.setLanguage(editorialObject.value(QLatin1String("language")).toString());
-    editorial.setText(editorialObject.value(QLatin1String("description")).toString());
+    editorial.setLanguage(editorialObject.value(QStringLiteral("language")).toString());
+    editorial.setText(editorialObject.value(QStringLiteral("description")).toString());
 
     return editorial;
 }
@@ -206,11 +206,11 @@ void parseCollection(QPlaceContent::Type type, const QJsonObject &object,
     Q_ASSERT(engine);
 
     if (totalCount)
-        *totalCount = object.value(QLatin1String("available")).toDouble();
+        *totalCount = object.value(QStringLiteral("available")).toDouble();
 
     int offset = 0;
-    if (object.contains(QLatin1String("offset")))
-        offset = object.value(QLatin1String("offset")).toDouble();
+    if (object.contains(QStringLiteral("offset")))
+        offset = object.value(QStringLiteral("offset")).toDouble();
 
     if (previous && object.contains(QStringLiteral("previous"))) {
         previous->setContentType(type);
@@ -223,7 +223,7 @@ void parseCollection(QPlaceContent::Type type, const QJsonObject &object,
     }
 
     if (collection) {
-        QJsonArray items = object.value(QLatin1String("items")).toArray();
+        QJsonArray items = object.value(QStringLiteral("items")).toArray();
         for (int i = 0; i < items.count(); ++i) {
             QJsonObject itemObject = items.at(i).toObject();