diff options
Diffstat (limited to 'src/plugins')
6 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/geoservices/esri/placemanagerengine_esri.cpp b/src/plugins/geoservices/esri/placemanagerengine_esri.cpp index f48a9e6d..3c2ae4b2 100644 --- a/src/plugins/geoservices/esri/placemanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/placemanagerengine_esri.cpp @@ -282,7 +282,7 @@ QString PlaceManagerEngineEsri::localizedName(const QJsonObject &jsonObject) { const QJsonObject localizedNames = jsonObject.value(kLocalizedNamesKey).toObject(); - for (const QLocale &locale : qAsConst(m_locales)) { + for (const QLocale &locale : std::as_const(m_locales)) { const QString localeStr = locale.name(); if (localizedNames.contains(localeStr)) { diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp index 7ec90dd8..174840e3 100644 --- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp @@ -118,7 +118,7 @@ QGeoTiledMappingManagerEngineMapbox::QGeoTiledMappingManagerEngineMapbox(const Q } QList<QString> mapIds; - for (const auto &mapType : qAsConst(mapTypes)) + for (const auto &mapType : std::as_const(mapTypes)) mapIds.push_back(mapType.name()); setSupportedMapTypes(mapTypes); diff --git a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp index aec7f59e..bef464af 100644 --- a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp @@ -182,7 +182,7 @@ QPlaceReply *QPlaceManagerEngineMapbox::doSearch(const QPlaceSearchRequest &requ // XXX: Investigate situations where we need to filter by 'country'. QStringList languageCodes; - for (const QLocale& locale: qAsConst(m_locales)) { + for (const QLocale& locale: std::as_const(m_locales)) { // Returns the language and country of this locale as a string of the // form "language_country", where language is a lowercase, two-letter // ISO 639 language code, and country is an uppercase, two- or diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp index 97a4cf39..a1ee42ef 100644 --- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp +++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp @@ -99,12 +99,12 @@ QMapbox::Feature featureFromMapCircle(QDeclarativeCircleMapItem *mapItem) QGeoCoordinate leftBound; QDeclarativeCircleMapItemPrivate::calculatePeripheralPoints(path, mapItem->center(), mapItem->radius(), circleSamples, leftBound); QList<QDoubleVector2D> pathProjected; - for (const QGeoCoordinate &c : qAsConst(path)) + for (const QGeoCoordinate &c : std::as_const(path)) pathProjected << p.geoToMapProjection(c); if (QDeclarativeCircleMapItemPrivateCPU::crossEarthPole(mapItem->center(), mapItem->radius())) QDeclarativeCircleMapItemPrivateCPU::preserveCircleGeometry(pathProjected, mapItem->center(), mapItem->radius(), p); path.clear(); - for (const QDoubleVector2D &c : qAsConst(pathProjected)) + for (const QDoubleVector2D &c : std::as_const(pathProjected)) path << p.mapProjectionToGeo(c); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 9fe0a997..a3eb3f96 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -817,7 +817,7 @@ QByteArray QPlaceManagerEngineNokiaV2::createLanguageString() const if (locales.isEmpty()) locales << QLocale(); - for (const QLocale &loc : qAsConst(locales)) { + for (const QLocale &loc : std::as_const(locales)) { language.append(loc.name().replace(2, 1, QLatin1Char('-')).toLatin1()); language.append(", "); } diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index dd5d7092..54d0255d 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -233,7 +233,7 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian if (parameters.contains(QStringLiteral("osm.mapping.providersrepository.disabled"))) disableRedirection = parameters.value(QStringLiteral("osm.mapping.providersrepository.disabled")).toBool(); - for (QGeoTileProviderOsm * provider: qAsConst(m_providers)) { + for (QGeoTileProviderOsm * provider: std::as_const(m_providers)) { // Providers are parented inside QGeoFileTileCacheOsm, as they are used in its destructor. if (disableRedirection) { provider->disableRedirection(); |