summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-04-21 09:05:24 -0700
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-05-20 13:35:51 +0200
commit7b696b6e399cea7cde8bf973370f23c324aff6a8 (patch)
tree320c02407e55bd8793592136f5930b31eac26074
parentd2d4f180c939929fb324f0e02d4c136e2ca5fcd0 (diff)
downloadqtlocation-7b696b6e399cea7cde8bf973370f23c324aff6a8.tar.gz
Fix warning about QString::SkipEmptyParts being deprecated
/home/tjmaciei/src/qt/qt5/qtlocation/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp:107:98: warning: ‘QString::SkipEmptyParts’ is deprecated [-Wdeprecated-declarations] Change-Id: Ib3333a58f37746f3b935fffd1607e152af50f386 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 3ca1149275e1e63e11c8d97f696e05bf73d2e076) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp2
-rw-r--r--src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp2
-rw-r--r--src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
index f2595d03..53f650e3 100644
--- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp
@@ -111,7 +111,7 @@ QGeoTiledMappingManagerEngineMapbox::QGeoTiledMappingManagerEngineMapbox(const Q
// New way to specify multiple customized map_ids via additional_map_ids
if (parameters.contains(QStringLiteral("mapbox.mapping.additional_map_ids"))) {
const QString ids = parameters.value(QStringLiteral("mapbox.mapping.additional_map_ids")).toString();
- const QStringList idList = ids.split(',', QString::SkipEmptyParts);
+ const QStringList idList = ids.split(',', Qt::SkipEmptyParts);
for (const QString &name: idList) {
if (!name.isEmpty())
diff --git a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
index 6d37d803..574ce44b 100644
--- a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
@@ -104,7 +104,7 @@ QPlaceResult parsePlaceResult(const QJsonObject &response, const QString &attrib
const QString categoryString = properties.value(QStringLiteral("category")).toString();
if (!categoryString.isEmpty()) {
QList<QPlaceCategory> categories;
- for (const QString &categoryId : categoryString.split(QStringLiteral(", "), QString::SkipEmptyParts)) {
+ for (const QString &categoryId : categoryString.split(QStringLiteral(", "), Qt::SkipEmptyParts)) {
QPlaceCategory category;
category.setName(QMapboxCommon::mapboxNameForCategory(categoryId));
category.setCategoryId(categoryId);
diff --git a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
index cde7871e..68068f21 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
@@ -119,7 +119,7 @@ QGeoMappingManagerEngineMapboxGL::QGeoMappingManagerEngineMapboxGL(const QVarian
if (parameters.contains(QStringLiteral("mapboxgl.mapping.additional_style_urls"))) {
const QString ids = parameters.value(QStringLiteral("mapboxgl.mapping.additional_style_urls")).toString();
- const QStringList idList = ids.split(',', QString::SkipEmptyParts);
+ const QStringList idList = ids.split(',', Qt::SkipEmptyParts);
for (auto it = idList.crbegin(), end = idList.crend(); it != end; ++it) {
if ((*it).isEmpty())