From 275efcc6c493e01fcbb623de4a277cffd584fa58 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 2 May 2020 16:05:22 -0700 Subject: Fix incorrect iteration over a C array Found by Clang 10: error: expression does not compute the number of elements in this array; element type is 'const MapStyleData', not 'QGeoMapType::MapStyle' [- Werror,-Wsizeof-array-div] Instead, just use range-for. Task-number: QTBUG-83666 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b589c5543b9d4 Coverity-Id: 226105 Reviewed-by: Volker Hilsheimer --- src/plugins/geoservices/esri/geomapsource.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/geoservices/esri/geomapsource.cpp b/src/plugins/geoservices/esri/geomapsource.cpp index 7a7d264f..6801aad5 100644 --- a/src/plugins/geoservices/esri/geomapsource.cpp +++ b/src/plugins/geoservices/esri/geomapsource.cpp @@ -90,9 +90,7 @@ QString GeoMapSource::toFormat(const QString &url) QGeoMapType::MapStyle GeoMapSource::mapStyle(const QString &styleString) { - for (unsigned int i = 0; i < sizeof(mapStyles)/sizeof(MapStyle); i++) { - const MapStyleData &mapStyle = mapStyles[i]; - + for (const MapStyleData &mapStyle : mapStyles) { if (styleString.compare(mapStyle.name, Qt::CaseInsensitive) == 0) return mapStyle.style; } -- cgit v1.2.1