diff options
author | Alex Wilson <alex.wilson@nokia.com> | 2012-05-14 17:45:11 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 06:04:26 +0200 |
commit | 42ca2853c8c91a29899d5cb24c2e854f6c366a55 (patch) | |
tree | 8e2c1eaa4e679e553afe5f1b40caa6be2dfc712b | |
parent | ad49d485cfc92164f491ff3d6ed41a16ea7085c5 (diff) | |
download | qtlocation-42ca2853c8c91a29899d5cb24c2e854f6c366a55.tar.gz |
Coding style fixes: use post-increment in for loops
For consistency with the standard Qt style.
Change-Id: Ife68906483c4805317bd31ddfc28809a8e7b3077
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
-rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 6 | ||||
-rw-r--r-- | src/imports/location/qdeclarativegeoroutemodel.cpp | 10 | ||||
-rw-r--r-- | src/imports/location/qdeclarativepolygonmapitem.cpp | 6 | ||||
-rw-r--r-- | src/imports/location/qdeclarativepolylinemapitem.cpp | 4 | ||||
-rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 2 | ||||
-rw-r--r-- | src/location/qgeopositioninfo.cpp | 2 | ||||
-rw-r--r-- | src/location/qgeopositioninfosource.cpp | 2 | ||||
-rw-r--r-- | src/location/qgeosatelliteinfo.cpp | 2 | ||||
-rw-r--r-- | src/location/qlocationutils.cpp | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index c88def75..0c5679ad 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -238,7 +238,7 @@ void QDeclarativeGeoMap::onMapChildrenChanged() QObjectList kids = children(); bool foundCopyrights = false; - for (int i = 0; i < kids.size(); i++) { + for (int i = 0; i < kids.size(); ++i) { QDeclarativeGeoMapCopyrightNotice *copyrights = qobject_cast<QDeclarativeGeoMapCopyrightNotice*>(kids.at(i)); if (copyrights) { foundCopyrights = true; @@ -1180,7 +1180,7 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(bool refine) topLeftY = item->pos().y(); bottomRightX = topLeftX + item->width(); bottomRightY = topLeftY + item->height(); - itemCount++; + ++itemCount; } if (itemCount == 0) { minX = topLeftX; @@ -1193,7 +1193,7 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(bool refine) minY = qMin(minY, topLeftY); maxY = qMax(maxY, bottomRightY); } - itemCount++; + ++itemCount; } if (itemCount == 0) diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 64f240b8..ccb1b32e 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -674,7 +674,7 @@ QList<int> QDeclarativeGeoRouteQuery::featureTypes() { QList<int> list; - for (int i = 0; i < request_.featureTypes().count(); i++) { + for (int i = 0; i < request_.featureTypes().count(); ++i) { list.append(static_cast<int>(request_.featureTypes().at(i))); } return list; @@ -885,7 +885,7 @@ void QDeclarativeGeoRouteQuery::clearExcludedAreas() { if (!exclusions_.count()) return; - for (int i = 0; i < exclusions_.count(); i++) + for (int i = 0; i < exclusions_.count(); ++i) exclusions_.at(i)->disconnect(this); exclusions_.clear(); emit excludedAreasChanged(); @@ -966,7 +966,7 @@ void QDeclarativeGeoRouteQuery::clearWaypoints() { if (!waypoints_.count()) return; - for (int i = 0; i < waypoints_.count(); i++) + for (int i = 0; i < waypoints_.count(); ++i) waypoints_.at(i)->disconnect(this); waypoints_.clear(); emit waypointsChanged(); @@ -1238,10 +1238,10 @@ QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest() { // Bit inefficient, but waypoint and excludearea count is not big QList<QGeoCoordinate> waypoints; - for (int i = 0; i < waypoints_.count(); i++) + for (int i = 0; i < waypoints_.count(); ++i) waypoints.append(waypoints_.at(i)->coordinate()); QList<QGeoBoundingBox> exclusions; - for (int i = 0; i < exclusions_.count(); i++) + for (int i = 0; i < exclusions_.count(); ++i) exclusions.append(exclusions_.at(i)->box()); request_.setWaypoints(waypoints); diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 74291f37..6e535fa6 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -205,11 +205,11 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map) if (ts.indices.type() == QVertexIndexVector::UnsignedInt) { const quint32 *ix = reinterpret_cast<const quint32*>(ts.indices.data()); - for (int i = 0; i < (ts.indices.size()/3*3); i++) + for (int i = 0; i < (ts.indices.size()/3*3); ++i) screenIndices_ << ix[i]; } else { const quint16 *ix = reinterpret_cast<const quint16*>(ts.indices.data()); - for (int i = 0; i < (ts.indices.size()/3*3); i++) + for (int i = 0; i < (ts.indices.size()/3*3); ++i) screenIndices_ << ix[i]; } for (int i = 0; i < (ts.vertices.size()/2*2); i += 2) @@ -542,7 +542,7 @@ void QDeclarativePolygonMapItem::dragEnded() if (newCoordinate.isValid()) { qreal firstLongitude = path_.at(0).longitude(); qreal firstLatitude = path_.at(0).latitude(); - for (int i = 0; i<path_.count(); i++){ + for (int i = 0; i<path_.count(); ++i) { QGeoCoordinate coord = path_.at(i); coord.setLongitude(coord.longitude() + newCoordinate.longitude() - firstLongitude); coord.setLatitude(coord.latitude() + newCoordinate.latitude() - firstLatitude); diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 4375b84a..fcade1fb 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -343,7 +343,7 @@ static void clipPathToRect(const QVector<qreal> &points, outTypes.reserve(types.size()); qreal lastX, lastY; - for (int i = 0; i < types.size(); i++) { + for (int i = 0; i < types.size(); ++i) { if (i > 0 && types[i] != QPainterPath::MoveToElement) { qreal x = points[i*2], y = points[i*2+1]; clipSegmentToRect(lastX, lastY, x, y, clipRect, outPoints, outTypes); @@ -687,7 +687,7 @@ void QDeclarativePolylineMapItem::dragEnded() if (newCoordinate.isValid()) { qreal firstLongitude = path_.at(0).longitude(); qreal firstLatitude = path_.at(0).latitude(); - for (int i = 0; i<path_.count(); i++){ + for (int i = 0; i<path_.count(); ++i) { QGeoCoordinate coord = path_.at(i); coord.setLongitude(coord.longitude() + newCoordinate.longitude() - firstLongitude); coord.setLatitude(coord.latitude() + newCoordinate.latitude() - firstLatitude); diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 0bfdb660..9c438cd1 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -605,7 +605,7 @@ void QGeoServiceProviderPrivate::loadPluginMetadata(QHash<QString, QJsonObject> { QFactoryLoader *l = loader(); QList<QJsonObject> meta = l->metaData(); - for (int i = 0; i < meta.size(); i++) { + for (int i = 0; i < meta.size(); ++i) { QJsonObject obj = meta.at(i).value(QStringLiteral("MetaData")).toObject(); obj.insert(QStringLiteral("index"), i); list.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj); diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp index 3e3c4372..7d06bcaa 100644 --- a/src/location/qgeopositioninfo.cpp +++ b/src/location/qgeopositioninfo.cpp @@ -261,7 +261,7 @@ QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info) QList<int> attribs = info.d->doubleAttribs.keys(); qStableSort(attribs.begin(), attribs.end()); // Output a sorted list from an unsorted hash. - for (int i = 0; i < attribs.count(); i++) { + for (int i = 0; i < attribs.count(); ++i) { dbg.nospace() << ", "; switch (attribs[i]) { case QGeoPositionInfo::Direction: diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp index d7f45ebd..cfa8e57d 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/location/qgeopositioninfosource.cpp @@ -161,7 +161,7 @@ void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QHash<QString, QJsonObjec { QFactoryLoader *l = loader(); QList<QJsonObject> meta = l->metaData(); - for (int i = 0; i < meta.size(); i++) { + for (int i = 0; i < meta.size(); ++i) { QJsonObject obj = meta.at(i).value(QStringLiteral("MetaData")).toObject(); obj.insert(QStringLiteral("index"), i); plugins.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj); diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp index 80769fb5..208fcd9a 100644 --- a/src/location/qgeosatelliteinfo.cpp +++ b/src/location/qgeosatelliteinfo.cpp @@ -251,7 +251,7 @@ QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info) QList<int> attribs = info.d->doubleAttribs.keys(); - for (int i = 0; i < attribs.count(); i++) { + for (int i = 0; i < attribs.count(); ++i) { dbg.nospace() << ", "; switch (attribs[i]) { case QGeoSatelliteInfo::Elevation: diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp index 96481e1a..9991116c 100644 --- a/src/location/qlocationutils.cpp +++ b/src/location/qlocationutils.cpp @@ -273,7 +273,7 @@ bool QLocationUtils::getPosInfoFromNmea(const char *data, int size, QGeoPosition bool QLocationUtils::hasValidNmeaChecksum(const char *data, int size) { int asteriskIndex = -1; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; ++i) { if (data[i] == '*') { asteriskIndex = i; break; @@ -286,7 +286,7 @@ bool QLocationUtils::hasValidNmeaChecksum(const char *data, int size) // XOR byte value of all characters between '$' and '*' int result = 0; - for (int i = 1; i < asteriskIndex; i++) + for (int i = 1; i < asteriskIndex; ++i) result ^= data[i]; /* char calc[CSUM_LEN + 1]; |