1 files changed, 9 insertions, 10 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index a26209e1..8a153deb 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -458,12 +458,11 @@ void QDeclarativeGeoMap::populateMap()
 void QDeclarativeGeoMap::populateParameters()
 {
     QObjectList kids = children();
-    QList<QQuickItem *> quickKids = childItems();
-    for (int i = 0; i < quickKids.count(); ++i)
-        kids.append(quickKids.at(i));
-    for (int i = 0; i < kids.size(); ++i) {
-        QDeclarativeGeoMapParameter *mapParameter = qobject_cast<QDeclarativeGeoMapParameter *>(kids.at(i));
-        if (mapParameter)
+    const QList<QQuickItem *> quickKids = childItems();
+    for (const auto &quickKid : quickKids)
+        kids.append(quickKid);
+    for (auto *kid : qAsConst(kids)) {
+        if (auto *mapParameter = qobject_cast<QDeclarativeGeoMapParameter *>(kid))
             addMapParameter(mapParameter);
     }
 }
@@ -2062,8 +2061,8 @@ void QDeclarativeGeoMap::clearMapItems()
     if (m_mapItems.isEmpty())
         return;
 
-    int removed = 0;
-    for (int i = 0; i < m_mapItemGroups.count(); ++i) {
+    qsizetype removed = 0;
+    for (qsizetype i = 0; i < m_mapItemGroups.count(); ++i) {
         auto item = m_mapItemGroups.at(i);
         // Processing only top-level groups (!views)
         if (qobject_cast<QDeclarativeGeoMapItemView *>(item))
@@ -2395,8 +2394,8 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(const QList<QPointer<QDecla
     bool haveQuickItem = false;
 
     // find bounds of all map items
-    int itemCount = 0;
-    for (int i = 0; i < mapItems.count(); ++i) {
+    qsizetype itemCount = 0;
+    for (qsizetype i = 0; i < mapItems.count(); ++i) {
         if (!mapItems.at(i))
             continue;
         QDeclarativeGeoMapItemBase *item = mapItems.at(i).data();