summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMate Barany <mate.barany@qt.io>2022-08-03 17:08:57 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-08 17:36:08 +0000
commit3b6d67f10b0e1973539ec06b81cebb412cec7926 (patch)
tree095353f90055a4874d32c4360957f8962129ecf4
parentcfc90d5570f39a202eaaf4dcdd385590904be1bf (diff)
Replace indexed for loops with ranged for loops
As part of the qsizetype epic, replace indexed for loops with ranged for loops where possible. Task-number: QTBUG-103552 Change-Id: If9323bbd1f5aac5e82e3289efca24f26d64b5d07 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 5046c912e828a4a2beb909538f33734f2cad0fb9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/position/nmea/qiopipe.cpp4
-rw-r--r--src/positioningquick/locationsingleton.cpp34
-rw-r--r--src/positioningquick/qdeclarativepositionsource.cpp4
3 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/position/nmea/qiopipe.cpp b/src/plugins/position/nmea/qiopipe.cpp
index 2accfe84..9822631a 100644
--- a/src/plugins/position/nmea/qiopipe.cpp
+++ b/src/plugins/position/nmea/qiopipe.cpp
@@ -60,8 +60,8 @@ void QIOPipePrivate::pumpData(const QByteArray &ba)
childPipes.remove(i);
}
} else {
- for (int i = 0; i < readBuffers.size(); i++)
- readBuffers[i].append(ba);
+ for (auto &buffer : readBuffers)
+ buffer.append(ba);
}
}
diff --git a/src/positioningquick/locationsingleton.cpp b/src/positioningquick/locationsingleton.cpp
index 491432df..41745e06 100644
--- a/src/positioningquick/locationsingleton.cpp
+++ b/src/positioningquick/locationsingleton.cpp
@@ -139,10 +139,11 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate &topLeft,
QGeoRectangle LocationSingleton::rectangle(const QVariantList &coordinates) const
{
QList<QGeoCoordinate> internalCoordinates;
- for (int i = 0; i < coordinates.size(); i++) {
- if (coordinates.at(i).canConvert<QGeoCoordinate>())
- internalCoordinates << coordinates.at(i).value<QGeoCoordinate>();
+ for (const auto &coordinate : coordinates) {
+ if (coordinate.canConvert<QGeoCoordinate>())
+ internalCoordinates << coordinate.value<QGeoCoordinate>();
}
+
return QGeoRectangle(internalCoordinates);
}
@@ -235,10 +236,11 @@ QGeoPolygon LocationSingleton::polygon() const
QGeoPolygon LocationSingleton::polygon(const QVariantList &coordinates) const
{
QList<QGeoCoordinate> internalCoordinates;
- for (int i = 0; i < coordinates.size(); i++) {
- if (coordinates.at(i).canConvert<QGeoCoordinate>())
- internalCoordinates << coordinates.at(i).value<QGeoCoordinate>();
+ for (const auto &coordinate : coordinates) {
+ if (coordinate.canConvert<QGeoCoordinate>())
+ internalCoordinates << coordinate.value<QGeoCoordinate>();
}
+
return QGeoPolygon(internalCoordinates);
}
@@ -253,21 +255,21 @@ QGeoPolygon LocationSingleton::polygon(const QVariantList &coordinates) const
QGeoPolygon LocationSingleton::polygon(const QVariantList &perimeter, const QVariantList &holes) const
{
QList<QGeoCoordinate> internalCoordinates;
- for (int i = 0; i < perimeter.size(); i++) {
- if (perimeter.at(i).canConvert<QGeoCoordinate>())
- internalCoordinates << perimeter.at(i).value<QGeoCoordinate>();
+ for (const auto &coordinate : perimeter) {
+ if (coordinate.canConvert<QGeoCoordinate>())
+ internalCoordinates << coordinate.value<QGeoCoordinate>();
}
QGeoPolygon poly(internalCoordinates);
- for (qsizetype i = 0; i < holes.size(); ++i) {
- if (holes.at(i).metaType().id() == QMetaType::QVariantList) {
+ for (const auto &h : holes) {
+ if (h.metaType().id() == QMetaType::QVariantList) {
QList<QGeoCoordinate> hole;
- const QVariantList &holeData = holes.at(i).toList();
- for (qsizetype j = 0; j < holeData.size(); ++j) {
- if (holeData.at(j).canConvert<QGeoCoordinate>())
- hole << holeData.at(j).value<QGeoCoordinate>();
+ const QVariantList &holeData = h.toList();
+ for (const auto &coord : holeData) {
+ if (coord.canConvert<QGeoCoordinate>())
+ hole << coord.value<QGeoCoordinate>();
}
- if (hole.size())
+ if (!hole.isEmpty())
poly.addHole(hole);
}
}
diff --git a/src/positioningquick/qdeclarativepositionsource.cpp b/src/positioningquick/qdeclarativepositionsource.cpp
index b019b23b..0a059144 100644
--- a/src/positioningquick/qdeclarativepositionsource.cpp
+++ b/src/positioningquick/qdeclarativepositionsource.cpp
@@ -407,10 +407,8 @@ QVariantMap QDeclarativePositionSource::parameterMap() const
{
QVariantMap map;
- for (int i = 0; i < m_parameters.size(); ++i) {
- QDeclarativePluginParameter *parameter = m_parameters.at(i);
+ for (const auto *parameter : m_parameters)
map.insert(parameter->name(), parameter->value());
- }
return map;
}