From b9f167d7aea56a1ea4b5cafb4bcda763bf7a0e5e Mon Sep 17 00:00:00 2001 From: Lauri Laanmets Date: Thu, 30 Sep 2021 16:39:47 +0300 Subject: Correct string literal comparison and concatenation This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: Ib4c845679a9dcdd9994603076d9ba7d06c2d1c47 Reviewed-by: Ivan Solovev Reviewed-by: Alex Blasche Reviewed-by: Andreas Buhr --- .../esri/geotiledmappingmanagerengine_esri.cpp | 8 ++- .../geoservices/nokia/qgeoroutexmlparser.cpp | 72 +++++++++++----------- src/plugins/geoservices/nokia/qgeouriprovider.cpp | 2 +- 3 files changed, 42 insertions(+), 40 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp index 5d15835d..db75619e 100644 --- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp @@ -254,9 +254,11 @@ bool GeoTiledMappingManagerEngineEsri::initializeMapSources(QGeoServiceProvider: if (!mapsDocument.isObject()) { *error = QGeoServiceProvider::NotSupportedError; - *errorString = Q_FUNC_INFO + QStringLiteral("JSON error: ") + (int)parseError.error - + ", offset: " + parseError.offset - + ", details: " + parseError.errorString(); + *errorString = QString("%1JSON error: %2, offset: %3, details: %4") + .arg(Q_FUNC_INFO) + .arg((int)parseError.error) + .arg(parseError.offset) + .arg(parseError.errorString()); return false; } diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index 65e39dee..5e5c51be 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -103,22 +103,22 @@ bool QGeoRouteXmlParser::parseRootElement() } bool updateroute = false; - if (m_reader->name() != "CalculateRoute" && m_reader->name() != "GetRoute") { + if (m_reader->name() != QLatin1String("CalculateRoute") && m_reader->name() != QLatin1String("GetRoute")) { m_reader->raiseError(QString("The root element is expected to have the name \"CalculateRoute\" or \"GetRoute\" (root element was named \"%1\").").arg(m_reader->name().toString())); return false; - } else if (m_reader->name() == "GetRoute") { + } else if (m_reader->name() == QLatin1String("GetRoute")) { updateroute = true; } if (m_reader->readNextStartElement()) { - if (m_reader->name() != "Response") { + if (m_reader->name() != QLatin1String("Response")) { m_reader->raiseError(QString("Expected a element named \"Response\" (element was named \"%1\").").arg(m_reader->name().toString())); return false; } } while (m_reader->readNextStartElement() && !m_reader->hasError()) { - if (m_reader->name() == "Route") { + if (m_reader->name() == QLatin1String("Route")) { QGeoRoute route; route.setRequest(m_request); if (updateroute) @@ -126,7 +126,7 @@ bool QGeoRouteXmlParser::parseRootElement() if (!parseRoute(&route)) continue; //route parsing failed move on to the next m_results.append(route); - } else if (m_reader->name() == "Progress") { + } else if (m_reader->name() == QLatin1String("Progress")) { //TODO: updated route progress m_reader->skipCurrentElement(); } else { @@ -139,39 +139,39 @@ bool QGeoRouteXmlParser::parseRootElement() bool QGeoRouteXmlParser::parseRoute(QGeoRoute *route) { - Q_ASSERT(m_reader->isStartElement() && m_reader->name() == "Route"); + Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("Route")); m_maneuvers.clear(); // m_segments.clear(); m_legs.clear(); int legIndex = 0; m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == "Route") && + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Route")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { - if (m_reader->name() == "RouteId") { + if (m_reader->name() == QLatin1String("RouteId")) { route->setRouteId(m_reader->readElementText()); } //else if (m_reader->name() == "Waypoint") { // succeeded = parseWaypoint(route); //} - else if (m_reader->name() == "Mode") { + else if (m_reader->name() == QLatin1String("Mode")) { if (!parseMode(route)) return false; - } else if (m_reader->name() == "Shape") { + } else if (m_reader->name() == QLatin1String("Shape")) { QString elementName = m_reader->name().toString(); QList path; if (!parseGeoPoints(m_reader->readElementText(), &path, elementName)) return false; route->setPath(path); - } else if (m_reader->name() == "BoundingBox") { + } else if (m_reader->name() == QLatin1String("BoundingBox")) { QGeoRectangle bounds; if (!parseBoundingBox(bounds)) return false; route->setBounds(bounds); - } else if (m_reader->name() == "Leg") { + } else if (m_reader->name() == QLatin1String("Leg")) { if (!parseLeg(legIndex++)) return false; - } else if (m_reader->name() == "Summary") { + } else if (m_reader->name() == QLatin1String("Summary")) { if (!parseSummary(route)) return false; } else { @@ -209,9 +209,9 @@ bool QGeoRouteXmlParser::parseLeg(int legIndex) // if (!parseLink(links)) // return false; // } - else if (m_reader->name() == "TravelTime") { + else if (m_reader->name() == QLatin1String("TravelTime")) { leg.setTravelTime(qRound(m_reader->readElementText().toDouble())); - } else if (m_reader->name() == "Length") { + } else if (m_reader->name() == QLatin1String("Length")) { leg.setDistance(m_reader->readElementText().toDouble()); } else { m_reader->skipCurrentElement(); @@ -343,13 +343,13 @@ bool QGeoRouteXmlParser::parseWaypoint(QGeoRoute *route) bool QGeoRouteXmlParser::parseMode(QGeoRoute *route) { - Q_ASSERT(m_reader->isStartElement() && m_reader->name() == "Mode"); + Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("Mode")); m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == "Mode") && + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Mode")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { - if (m_reader->name() == "TransportModes") { + if (m_reader->name() == QLatin1String("TransportModes")) { QString value = m_reader->readElementText(); if (value == "car") route->setTravelMode(QGeoRouteRequest::CarTravel); @@ -378,19 +378,19 @@ bool QGeoRouteXmlParser::parseMode(QGeoRoute *route) bool QGeoRouteXmlParser::parseSummary(QGeoRoute *route) { Q_ASSERT(route); - Q_ASSERT(m_reader->isStartElement() && m_reader->name() == "Summary"); + Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("Summary")); m_reader->readNext(); double baseTime = -1, trafficTime = -1; - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == "Summary") && + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Summary")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { - if (m_reader->name() == "Distance") { + if (m_reader->name() == QLatin1String("Distance")) { route->setDistance(m_reader->readElementText().toDouble()); - } else if (m_reader->name() == "TrafficTime") { + } else if (m_reader->name() == QLatin1String("TrafficTime")) { trafficTime = m_reader->readElementText().toDouble(); - } else if (m_reader->name() == "BaseTime") { + } else if (m_reader->name() == QLatin1String("BaseTime")) { baseTime = m_reader->readElementText().toDouble(); } else { m_reader->skipCurrentElement(); @@ -433,7 +433,7 @@ bool QGeoRouteXmlParser::parseCoordinates(QGeoCoordinate &coord) bool QGeoRouteXmlParser::parseManeuver(QList &maneuvers) { - Q_ASSERT(m_reader->isStartElement() && m_reader->name() == "Maneuver"); + Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("Maneuver")); if (!m_reader->attributes().hasAttribute("id")) { m_reader->raiseError("The element \"Maneuver\" did not have the required attribute \"id\"."); @@ -443,28 +443,28 @@ bool QGeoRouteXmlParser::parseManeuver(QList &maneuvers) maneuverContainter.id = m_reader->attributes().value("id").toString(); m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == "Maneuver") && + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Maneuver")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { - if (m_reader->name() == "Position") { + if (m_reader->name() == QLatin1String("Position")) { QGeoCoordinate coordinates; if (parseCoordinates(coordinates)) maneuverContainter.maneuver.setPosition(coordinates); - } else if (m_reader->name() == "Instruction") { + } else if (m_reader->name() == QLatin1String("Instruction")) { maneuverContainter.maneuver.setInstructionText(m_reader->readElementText()); - } else if (m_reader->name() == "Shape") { + } else if (m_reader->name() == QLatin1String("Shape")) { QString elementName = m_reader->name().toString(); QList path; if (!parseGeoPoints(m_reader->readElementText(), &path, elementName)) return false; maneuverContainter.path = path; - } else if (m_reader->name() == "ToLink") { + } else if (m_reader->name() == QLatin1String("ToLink")) { maneuverContainter.toLink = m_reader->readElementText(); - } else if (m_reader->name() == "TravelTime") { + } else if (m_reader->name() == QLatin1String("TravelTime")) { maneuverContainter.maneuver.setTimeToNextInstruction(qRound(m_reader->readElementText().toDouble())); - } else if (m_reader->name() == "Length") { + } else if (m_reader->name() == QLatin1String("Length")) { maneuverContainter.maneuver.setDistanceToNextInstruction(m_reader->readElementText().toDouble()); - } else if (m_reader->name() == "Direction") { + } else if (m_reader->name() == QLatin1String("Direction")) { QString value = m_reader->readElementText(); if (value == "forward") maneuverContainter.maneuver.setDirection(QGeoManeuver::DirectionForward); @@ -583,20 +583,20 @@ bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QListisStartElement() && m_reader->name() == "BoundingBox"); + Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("BoundingBox")); QGeoCoordinate tl; QGeoCoordinate br; m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == "BoundingBox") && + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("BoundingBox")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { - if (m_reader->name() == "TopLeft") { + if (m_reader->name() == QLatin1String("TopLeft")) { QGeoCoordinate coordinates; if (parseCoordinates(coordinates)) tl = coordinates; - } else if (m_reader->name() == "BottomRight") { + } else if (m_reader->name() == QLatin1String("BottomRight")) { QGeoCoordinate coordinates; if (parseCoordinates(coordinates)) br = coordinates; diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index 7be90bb2..4f7679a2 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -61,7 +61,7 @@ QGeoUriProvider::QGeoUriProvider( QString QGeoUriProvider::getCurrentHost() const { if (m_maxSubdomains) { - QString result(m_firstSubdomain.toLatin1() + QRandomGenerator::global()->bounded(m_maxSubdomains)); + auto result = QString("%1%2").arg(m_firstSubdomain.toLatin1()).arg(QRandomGenerator::global()->bounded(m_maxSubdomains)); result += '.' + m_currentHost; return result; } -- cgit v1.2.1