Replace int with qsizetype, count() with size()

Inspect and replace integers with qsizetype where
necessary. Also. since count() is being actively
deprecated, replace count() with size().

Since QCBorValue does not have a constructor that
accepts qsizetype, make the necessary cast to qint64.

Task-number: QTBUG-103552
Change-Id: I97113fb4420de0753bd3e263d7989112f628e281
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit a352e34c83e61cc787a3d6da7734162e3328cef5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/positioning/qgeoaddress.cpp b/src/positioning/qgeoaddress.cpp
index 70078197..18ee45eb 100644
--- a/src/positioning/qgeoaddress.cpp
+++ b/src/positioning/qgeoaddress.cpp
@@ -36,25 +36,25 @@ QT_IMPL_METATYPE_EXTERN(QGeoAddress)
 static QString addressLine(const QStringList &parts)
 {
     QString line;
-    Q_ASSERT(parts.count() % 2 == 0);
+    Q_ASSERT(parts.size() % 2 == 0);
 
     //iterate until just before the last pair
     QString penultimateSeparator;
-    for (int i = 0; i < parts.count() - 2; i += 2) {
+    for (qsizetype i = 0; i < parts.size() - 2; i += 2) {
         if (!parts.at(i).isEmpty()) {
             line.append(parts.at(i) + parts.at(i + 1));
             penultimateSeparator = parts.at(i + 1);
         }
     }
 
-    if (parts.at(parts.count() - 2).isEmpty()) {
+    if (parts.at(parts.size() - 2).isEmpty()) {
         line.chop(penultimateSeparator.length());
 
         if (!line.isEmpty())
-            line.append(parts.at(parts.count() - 1));
+            line.append(parts.at(parts.size() - 1));
     } else {
-        line.append(parts.at(parts.count() - 2));
-        line.append(parts.at(parts.count() - 1));
+        line.append(parts.at(parts.size() - 2));
+        line.append(parts.at(parts.size() - 1));
     }
 
     return line;
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp
index 20b49094..87de692d 100644
--- a/src/positioning/qgeopositioninfosource.cpp
+++ b/src/positioning/qgeopositioninfosource.cpp
@@ -126,7 +126,7 @@ void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QMultiHash<QString, QCbor
 {
     QFactoryLoader *l = loader();
     QList<QPluginParsedMetaData> meta = l->metaData();
-    for (int i = 0; i < meta.size(); ++i) {
+    for (qsizetype i = 0; i < meta.size(); ++i) {
         QCborMap obj = meta.at(i).value(QtPluginMetaDataKeys::MetaData).toMap();
         const QLatin1String testableKey("Testable");
         if (!obj.value(testableKey).toBool(true)) {
@@ -134,7 +134,7 @@ void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QMultiHash<QString, QCbor
             if (inTest)
                 continue;
         }
-        obj.insert(QLatin1String("index"), i);
+        obj.insert(QLatin1String("index"), static_cast<qint64>(i));
         plugins.insert(obj.value(QStringLiteral("Provider")).toString(), obj);
     }
 }
diff --git a/src/positioningquick/locationsingleton.cpp b/src/positioningquick/locationsingleton.cpp
index 5a7b1eee..491432df 100644
--- a/src/positioningquick/locationsingleton.cpp
+++ b/src/positioningquick/locationsingleton.cpp
@@ -259,11 +259,11 @@ QGeoPolygon LocationSingleton::polygon(const QVariantList &perimeter, const QVar
     }
     QGeoPolygon poly(internalCoordinates);
 
-    for (int i = 0; i < holes.size(); i++) {
+    for (qsizetype i = 0; i < holes.size(); ++i) {
         if (holes.at(i).metaType().id() == QMetaType::QVariantList) {
             QList<QGeoCoordinate> hole;
             const QVariantList &holeData = holes.at(i).toList();
-            for (int j = 0; j < holeData.size(); j++) {
+            for (qsizetype j = 0; j < holeData.size(); ++j) {
                 if (holeData.at(j).canConvert<QGeoCoordinate>())
                     hole << holeData.at(j).value<QGeoCoordinate>();
             }