diff options
Diffstat (limited to 'src/plugins/geoservices')
9 files changed, 140 insertions, 140 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(); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index 3b43c357..899595db 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -126,13 +126,13 @@ void QPlaceSearchReplyImpl::replyFinished() if (resultsObject.contains(QStringLiteral("results"))) resultsObject = resultsObject.value(QStringLiteral("results")).toObject(); - QJsonArray items = resultsObject.value(QLatin1String("items")).toArray(); + QJsonArray items = resultsObject.value(QStringLiteral("items")).toArray(); QList<QPlaceSearchResult> results; for (int i = 0; i < items.count(); ++i) { QJsonObject item = items.at(i).toObject(); - const QString type = item.value(QLatin1String("type")).toString(); + const QString type = item.value(QStringLiteral("type")).toString(); if (type == QStringLiteral("urn:nlp-types:place")) results.append(parsePlaceResult(item)); else if (type == QStringLiteral("urn:nlp-types:search")) @@ -164,22 +164,22 @@ QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) co { QPlaceResult result; - if (item.contains(QLatin1String("distance"))) - result.setDistance(item.value(QLatin1String("distance")).toDouble()); + if (item.contains(QStringLiteral("distance"))) + result.setDistance(item.value(QStringLiteral("distance")).toDouble()); QPlace place; QGeoLocation location; - location.setCoordinate(parseCoordinate(item.value(QLatin1String("position")).toArray())); + location.setCoordinate(parseCoordinate(item.value(QStringLiteral("position")).toArray())); - const QString vicinity = item.value(QLatin1String("vicinity")).toString(); + const QString vicinity = item.value(QStringLiteral("vicinity")).toString(); QGeoAddress address; address.setText(vicinity); location.setAddress(address); - if (item.contains(QLatin1String("bbox"))) { - QJsonArray bbox = item.value(QLatin1String("bbox")).toArray(); + if (item.contains(QStringLiteral("bbox"))) { + QJsonArray bbox = item.value(QStringLiteral("bbox")).toArray(); QGeoRectangle box(QGeoCoordinate(bbox.at(3).toDouble(), bbox.at(0).toDouble()), QGeoCoordinate(bbox.at(1).toDouble(), bbox.at(2).toDouble())); location.setBoundingBox(box); @@ -188,32 +188,32 @@ QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) co place.setLocation(location); QPlaceRatings ratings; - ratings.setAverage(item.value(QLatin1String("averageRating")).toDouble()); + ratings.setAverage(item.value(QStringLiteral("averageRating")).toDouble()); ratings.setMaximum(5.0); place.setRatings(ratings); - const QString title = item.value(QLatin1String("title")).toString(); + const QString title = item.value(QStringLiteral("title")).toString(); place.setName(title); result.setTitle(title); - QPlaceIcon icon = m_engine->icon(item.value(QLatin1String("icon")).toString()); + QPlaceIcon icon = m_engine->icon(item.value(QStringLiteral("icon")).toString()); place.setIcon(icon); result.setIcon(icon); - place.setCategory(parseCategory(item.value(QLatin1String("category")).toObject(), + place.setCategory(parseCategory(item.value(QStringLiteral("category")).toObject(), m_engine)); - //QJsonArray having = item.value(QLatin1String("having")).toArray(); + //QJsonArray having = item.value(QStringLiteral("having")).toArray(); - result.setSponsored(item.value(QLatin1String("sponsored")).toBool()); + result.setSponsored(item.value(QStringLiteral("sponsored")).toBool()); - QUrl href = item.value(QLatin1String("href")).toString(); - //QUrl type = item.value(QLatin1String("type")).toString(); + QUrl href = item.value(QStringLiteral("href")).toString(); + //QUrl type = item.value(QStringLiteral("type")).toString(); place.setPlaceId(href.path().mid(18, 41)); QPlaceAttribute provider; - provider.setText(QLatin1String("nokia")); + provider.setText(QStringLiteral("nokia")); place.setExtendedAttribute(QPlaceAttribute::Provider, provider); place.setVisibility(QLocation::PublicVisibility); @@ -226,7 +226,7 @@ QPlaceProposedSearchResult QPlaceSearchReplyImpl::parseSearchResult(const QJsonO { QPlaceProposedSearchResult result; - result.setTitle(item.value(QLatin1String("title")).toString()); + result.setTitle(item.value(QStringLiteral("title")).toString()); QPlaceIcon icon = m_engine->icon(item.value(QStringLiteral("icon")).toString()); result.setIcon(icon); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp index d2e6d9e5..4808d394 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp @@ -108,7 +108,7 @@ void QPlaceSearchSuggestionReplyImpl::replyFinished() QJsonObject object = document.object(); - QJsonArray suggestions = object.value(QLatin1String("suggestions")).toArray(); + QJsonArray suggestions = object.value(QStringLiteral("suggestions")).toArray(); QStringList s; for (int i = 0; i < suggestions.count(); ++i) { diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index e032f8d3..caa752fb 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -102,7 +102,7 @@ bool QGeoRouteXmlParser::parseRootElement() if (m_reader->name() == QLatin1String("Error")) { QXmlStreamAttributes attributes = m_reader->attributes(); - if (attributes.value(QLatin1String("type")) == QLatin1String("ApplicationError") + if (attributes.value(QStringLiteral("type")) == QLatin1String("ApplicationError") && attributes.value("subtype") == QLatin1String("NoRouteFound")) return true; } diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 6d8967d5..896da461 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -87,8 +87,8 @@ namespace void checkUsageTerms(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) { - const QString appId = parameters.value(QLatin1String("app_id")).toString(); - const QString token = parameters.value(QLatin1String("token")).toString(); + const QString appId = parameters.value(QStringLiteral("app_id")).toString(); + const QString token = parameters.value(QStringLiteral("token")).toString(); if (!isValidParameter(appId) || !isValidParameter(token)) { diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 8c3cbe3b..6b453e63 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -111,28 +111,28 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( // don't need this boilerplate QString cacheDir; - if (parameters.contains(QLatin1String("mapping.cache.directory"))) - cacheDir = parameters.value(QLatin1String("mapping.cache.directory")).toString(); + if (parameters.contains(QStringLiteral("mapping.cache.directory"))) + cacheDir = parameters.value(QStringLiteral("mapping.cache.directory")).toString(); QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir); - if (parameters.contains(QLatin1String("mapping.cache.disk.size"))) { + if (parameters.contains(QStringLiteral("mapping.cache.disk.size"))) { bool ok = false; - int cacheSize = parameters.value(QLatin1String("mapping.cache.disk.size")).toString().toInt(&ok); + int cacheSize = parameters.value(QStringLiteral("mapping.cache.disk.size")).toString().toInt(&ok); if (ok) tileCache->setMaxDiskUsage(cacheSize); } - if (parameters.contains(QLatin1String("mapping.cache.memory.size"))) { + if (parameters.contains(QStringLiteral("mapping.cache.memory.size"))) { bool ok = false; - int cacheSize = parameters.value(QLatin1String("mapping.cache.memory.size")).toString().toInt(&ok); + int cacheSize = parameters.value(QStringLiteral("mapping.cache.memory.size")).toString().toInt(&ok); if (ok) tileCache->setMaxMemoryUsage(cacheSize); } - if (parameters.contains(QLatin1String("mapping.cache.texture.size"))) { + if (parameters.contains(QStringLiteral("mapping.cache.texture.size"))) { bool ok = false; - int cacheSize = parameters.value(QLatin1String("mapping.cache.texture.size")).toString().toInt(&ok); + int cacheSize = parameters.value(QStringLiteral("mapping.cache.texture.size")).toString().toInt(&ok); if (ok) tileCache->setExtraTextureUsage(cacheSize); } @@ -149,26 +149,26 @@ QGeoTiledMappingManagerEngineNokia::~QGeoTiledMappingManagerEngineNokia() void QGeoTiledMappingManagerEngineNokia::populateMapSchemes() { - m_mapSchemes[0] = QLatin1String("normal.day"); - m_mapSchemes[1] = QLatin1String("normal.day"); - m_mapSchemes[2] = QLatin1String("satellite.day"); - m_mapSchemes[3] = QLatin1String("terrain.day"); - m_mapSchemes[4] = QLatin1String("hybrid.day"); - m_mapSchemes[5] = QLatin1String("normal.day.transit"); - m_mapSchemes[6] = QLatin1String("normal.day.grey"); - m_mapSchemes[7] = QLatin1String("normal.day.mobile"); - m_mapSchemes[8] = QLatin1String("terrain.day.mobile"); - m_mapSchemes[9] = QLatin1String("hybrid.day.mobile"); - m_mapSchemes[10] = QLatin1String("normal.day.transit.mobile"); - m_mapSchemes[11] = QLatin1String("normal.day.grey.mobile"); - m_mapSchemes[12] = QLatin1String("normal.day.custom"); - m_mapSchemes[13] = QLatin1String("normal.night"); - m_mapSchemes[14] = QLatin1String("normal.night.mobile"); - m_mapSchemes[15] = QLatin1String("normal.night.grey"); - m_mapSchemes[16] = QLatin1String("normal.night.grey.mobile"); - m_mapSchemes[17] = QLatin1String("pedestrian.day"); - m_mapSchemes[18] = QLatin1String("pedestrian.night"); - m_mapSchemes[19] = QLatin1String("carnav.day.grey"); + m_mapSchemes[0] = QStringLiteral("normal.day"); + m_mapSchemes[1] = QStringLiteral("normal.day"); + m_mapSchemes[2] = QStringLiteral("satellite.day"); + m_mapSchemes[3] = QStringLiteral("terrain.day"); + m_mapSchemes[4] = QStringLiteral("hybrid.day"); + m_mapSchemes[5] = QStringLiteral("normal.day.transit"); + m_mapSchemes[6] = QStringLiteral("normal.day.grey"); + m_mapSchemes[7] = QStringLiteral("normal.day.mobile"); + m_mapSchemes[8] = QStringLiteral("terrain.day.mobile"); + m_mapSchemes[9] = QStringLiteral("hybrid.day.mobile"); + m_mapSchemes[10] = QStringLiteral("normal.day.transit.mobile"); + m_mapSchemes[11] = QStringLiteral("normal.day.grey.mobile"); + m_mapSchemes[12] = QStringLiteral("normal.day.custom"); + m_mapSchemes[13] = QStringLiteral("normal.night"); + m_mapSchemes[14] = QStringLiteral("normal.night.mobile"); + m_mapSchemes[15] = QStringLiteral("normal.night.grey"); + m_mapSchemes[16] = QStringLiteral("normal.night.grey.mobile"); + m_mapSchemes[17] = QStringLiteral("pedestrian.day"); + m_mapSchemes[18] = QStringLiteral("pedestrian.night"); + m_mapSchemes[19] = QStringLiteral("carnav.day.grey"); } QString QGeoTiledMappingManagerEngineNokia::getScheme(int mapId) @@ -268,7 +268,7 @@ void QGeoTiledMappingManagerEngineNokia::updateVersion(const QJsonObject &newVer void QGeoTiledMappingManagerEngineNokia::saveMapVersion() { QDir saveDir(tileCache()->directory()); - QFile saveFile(saveDir.filePath(QLatin1String("nokia_version"))); + QFile saveFile(saveDir.filePath(QStringLiteral("nokia_version"))); if (!saveFile.open(QIODevice::WriteOnly)) { qWarning("Failed to write nokia map version."); @@ -283,7 +283,7 @@ void QGeoTiledMappingManagerEngineNokia::loadMapVersion() { QDir saveDir(tileCache()->directory()); - QFile loadFile(saveDir.filePath(QLatin1String("nokia_version"))); + QFile loadFile(saveDir.filePath(QStringLiteral("nokia_version"))); if (!loadFile.open(QIODevice::ReadOnly)) { qWarning("Failed to read nokia map version."); @@ -297,8 +297,8 @@ void QGeoTiledMappingManagerEngineNokia::loadMapVersion() QJsonObject object = doc.object(); - m_mapVersion.setVersion(object[QLatin1String("version")].toInt()); - m_mapVersion.setVersionData(object[QLatin1String("data")].toObject()); + m_mapVersion.setVersion(object[QStringLiteral("version")].toInt()); + m_mapVersion.setVersionData(object[QStringLiteral("data")].toObject()); } QString QGeoTiledMappingManagerEngineNokia::evaluateCopyrightsText(const QGeoMapType mapType, diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 30ad5808..6cc34a93 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -136,20 +136,20 @@ bool CategoryParser::parse(const QString &fileName) QJsonDocument document = QJsonDocument::fromJson(mappingFile.readAll()); if (document.isObject()) { QJsonObject docObject = document.object(); - if (docObject.contains(QLatin1String("offline_explore"))) { - m_exploreObject = docObject.value(QLatin1String("offline_explore")) + if (docObject.contains(QStringLiteral("offline_explore"))) { + m_exploreObject = docObject.value(QStringLiteral("offline_explore")) .toObject(); - if (m_exploreObject.contains(QLatin1String("ROOT"))) { + if (m_exploreObject.contains(QStringLiteral("ROOT"))) { processCategory(0, QString()); return true; } } else { - m_errorString = fileName + QLatin1String("does not contain the " - "offline_explore property"); + m_errorString = fileName + + QStringLiteral("does not contain the offline_explore property"); return false; } } else { - m_errorString = fileName + QLatin1String("is not an json object"); + m_errorString = fileName + QStringLiteral("is not an json object"); return false; } } @@ -180,10 +180,10 @@ void CategoryParser::processCategory(int level, const QString &id, const QString //a proper assignment to the tree happens at the end of function QJsonObject categoryJson = m_exploreObject.value(id.isEmpty() - ? QLatin1String("ROOT") : id).toObject(); - QJsonArray children = categoryJson.value(QLatin1String("children")).toArray(); + ? QStringLiteral("ROOT") : id).toObject(); + QJsonArray children = categoryJson.value(QStringLiteral("children")).toArray(); - if (level + 1 <= maxLevel && !categoryJson.contains(QLatin1String("final"))) { + if (level + 1 <= maxLevel && !categoryJson.contains(QStringLiteral("final"))) { for (int i = 0; i < children.count(); ++i) { QString childId = children.at(i).toString(); if (!m_tree.contains(childId)) { @@ -210,12 +210,12 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2( m_locales.append(QLocale()); - m_appId = parameters.value(QLatin1String("app_id")).toString(); - m_appCode = parameters.value(QLatin1String("token")).toString(); + m_appId = parameters.value(QStringLiteral("app_id")).toString(); + m_appCode = parameters.value(QStringLiteral("token")).toString(); m_theme = parameters.value(IconThemeKey, QString()).toString(); - if (m_theme == QLatin1String("default")) + if (m_theme == QStringLiteral("default")) m_theme.clear(); m_localDataPath = parameters.value(LocalDataPathKey, QString()).toString(); @@ -224,7 +224,7 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2( if (!dataLocations.isEmpty() && !dataLocations.first().isEmpty()) { m_localDataPath = dataLocations.first() - + QLatin1String("/nokia/qtlocation/data"); + + QStringLiteral("/nokia/qtlocation/data"); } } @@ -240,13 +240,13 @@ QPlaceManagerEngineNokiaV2::~QPlaceManagerEngineNokiaV2() {} QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &placeId) { QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/places/") + placeId); + QStringLiteral("/places/v1/places/") + placeId); QUrlQuery queryItems; - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); - //queryItems.append(qMakePair<QString, QString>(QLatin1String("size"), QString::number(5))); - //queryItems.append(qMakePair<QString, QString>(QLatin1String("image_dimensions"), QLatin1String("w64-h64,w100"))); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); + //queryItems.append(qMakePair<QString, QString>(QStringLiteral("size"), QString::number(5))); + //queryItems.append(qMakePair<QString, QString>(QStringLiteral("image_dimensions"), QStringLiteral("w64-h64,w100"))); requestUrl.setQuery(queryItems); @@ -271,45 +271,45 @@ QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QPlaceCont networkReply = sendRequest(u); } else { QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/places/") + request.placeId() + - QLatin1String("/media/")); + QStringLiteral("/places/v1/places/") + request.placeId() + + QStringLiteral("/media/")); QUrlQuery queryItems; switch (request.contentType()) { case QPlaceContent::ImageType: - requestUrl.setPath(requestUrl.path() + QLatin1String("images")); + requestUrl.setPath(requestUrl.path() + QStringLiteral("images")); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); if (request.limit() > 0) - queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); + queryItems.addQueryItem(QStringLiteral("size"), QString::number(request.limit())); - //queryItems.append(qMakePair<QString, QString>(QLatin1String("image_dimensions"), QLatin1String("w64-h64,w100"))); + //queryItems.append(qMakePair<QString, QString>(QStringLiteral("image_dimensions"), QStringLiteral("w64-h64,w100"))); requestUrl.setQuery(queryItems); networkReply = sendRequest(requestUrl); break; case QPlaceContent::ReviewType: - requestUrl.setPath(requestUrl.path() + QLatin1String("reviews")); + requestUrl.setPath(requestUrl.path() + QStringLiteral("reviews")); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); if (request.limit() > 0) - queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); + queryItems.addQueryItem(QStringLiteral("size"), QString::number(request.limit())); requestUrl.setQuery(queryItems); networkReply = sendRequest(requestUrl); break; case QPlaceContent::EditorialType: - requestUrl.setPath(requestUrl.path() + QLatin1String("editorials")); + requestUrl.setPath(requestUrl.path() + QStringLiteral("editorials")); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); if (request.limit() > 0) - queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); + queryItems.addQueryItem(QStringLiteral("size"), QString::number(request.limit())); requestUrl.setQuery(queryItems); @@ -352,7 +352,7 @@ static bool addAtForBoundingArea(const QGeoShape &area, if (!center.isValid()) { return false; } else { - queryItems->addQueryItem(QLatin1String("at"), + queryItems->addQueryItem(QStringLiteral("at"), QString::number(center.latitude()) + QLatin1Char(',') + QString::number(center.longitude())); @@ -424,13 +424,13 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest } else if (!query.searchTerm().isEmpty()) { // search term query QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/discover/search")); + QStringLiteral("/places/v1/discover/search")); - queryItems.addQueryItem(QLatin1String("q"), query.searchTerm()); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("q"), query.searchTerm()); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); if (query.limit() > 0) { - queryItems.addQueryItem(QLatin1String("size"), + queryItems.addQueryItem(QStringLiteral("size"), QString::number(query.limit())); } @@ -446,10 +446,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest return reply; } else if (!query.recommendationId().isEmpty()) { QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/places/") + query.recommendationId() + - QLatin1String("/related/recommended")); + QStringLiteral("/places/v1/places/") + query.recommendationId() + + QStringLiteral("/related/recommended")); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); requestUrl.setQuery(queryItems); @@ -470,10 +470,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest addAtForBoundingArea(query.searchArea(), &queryItems); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + queryItems.addQueryItem(QStringLiteral("tf"), QStringLiteral("html")); if (query.limit() > 0) { - queryItems.addQueryItem(QLatin1String("size"), + queryItems.addQueryItem(QStringLiteral("size"), QString::number(query.limit())); } @@ -512,11 +512,11 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const } QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/suggest")); + QStringLiteral("/places/v1/suggest")); QUrlQuery queryItems; - queryItems.addQueryItem(QLatin1String("q"), query.searchTerm()); + queryItems.addQueryItem(QStringLiteral("q"), query.searchTerm()); if (!addAtForBoundingArea(query.searchArea(), &queryItems)) { QPlaceSearchSuggestionReplyImpl *reply = new QPlaceSearchSuggestionReplyImpl(0, this); @@ -603,7 +603,7 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() m_tempTree.clear(); CategoryParser parser; - if (parser.parse(m_localDataPath + QLatin1String("/offline/offline-mapping.json"))) { + if (parser.parse(m_localDataPath + QStringLiteral("/offline/offline-mapping.json"))) { m_tempTree = parser.tree(); } else { PlaceCategoryNode rootNode; @@ -628,7 +628,7 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() ids.removeAll(QString()); foreach (const QString &id, ids) { QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/categories/places/") + id); + QStringLiteral("/places/v1/categories/places/") + id); QNetworkReply *networkReply = sendRequest(requestUrl); connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), @@ -783,12 +783,12 @@ void QPlaceManagerEngineNokiaV2::categoryReplyFinished() QJsonObject category = document.object(); - categoryId = category.value(QLatin1String("categoryId")).toString(); + categoryId = category.value(QStringLiteral("categoryId")).toString(); if (m_tempTree.contains(categoryId)) { PlaceCategoryNode node = m_tempTree.value(categoryId); - node.category.setName(category.value(QLatin1String("name")).toString()); + node.category.setName(category.value(QStringLiteral("name")).toString()); node.category.setCategoryId(categoryId); - node.category.setIcon(icon(category.value(QLatin1String("icon")).toString())); + node.category.setIcon(icon(category.value(QStringLiteral("icon")).toString())); m_tempTree.insert(categoryId, node); } @@ -824,8 +824,8 @@ void QPlaceManagerEngineNokiaV2::categoryReplyError() QNetworkReply *QPlaceManagerEngineNokiaV2::sendRequest(const QUrl &url) { QUrlQuery queryItems(url); - queryItems.addQueryItem(QLatin1String("app_id"), m_appId); - queryItems.addQueryItem(QLatin1String("app_code"), m_appCode); + queryItems.addQueryItem(QStringLiteral("app_id"), m_appId); + queryItems.addQueryItem(QStringLiteral("app_code"), m_appCode); QUrl requestUrl = url; requestUrl.setQuery(queryItems); diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp index 9f71c0b1..79298543 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp @@ -384,7 +384,7 @@ void QGeoRouteReplyOsm::networkReplyFinished() setFinished(true); } else { - setError(QGeoRouteReply::ParseError, QLatin1String("Couldn't parse json.")); + setError(QGeoRouteReply::ParseError, QStringLiteral("Couldn't parse json.")); } m_reply->deleteLater(); diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp index 8ed827a7..b4f59018 100644 --- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp @@ -69,13 +69,13 @@ QGeoRouteReply* QGeoRoutingManagerEngineOsm::calculateRoute(const QGeoRouteReque QNetworkRequest networkRequest; networkRequest.setRawHeader("User-Agent", m_userAgent); - QUrl url(QLatin1String("http://router.project-osrm.org/viaroute")); + QUrl url(QStringLiteral("http://router.project-osrm.org/viaroute")); QUrlQuery query; query.addQueryItem(QStringLiteral("instructions"), QStringLiteral("true")); foreach (const QGeoCoordinate &c, request.waypoints()) { - query.addQueryItem(QLatin1String("loc"), QString::number(c.latitude()) + QLatin1Char(',') + + query.addQueryItem(QStringLiteral("loc"), QString::number(c.latitude()) + QLatin1Char(',') + QString::number(c.longitude())); } |