Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: Iefd2fb627602ef4744d80858eee72a089ef5f4ec
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 10 insertions, 12 deletions

diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp
index 3a2732b2..4b0b2b51 100644
--- a/src/location/maps/qgeocameratiles.cpp
+++ b/src/location/maps/qgeocameratiles.cpp
@@ -44,7 +44,7 @@
 #include <QtPositioning/private/qdoublevector3d_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
 #include <QtGui/QMatrix4x4>
-#include <QVector>
+#include <QList>
 #include <QMap>
 #include <QPair>
 #include <QSet>
@@ -346,10 +346,8 @@ Frustum QGeoCameraTilesPrivate::createFrustum(double viewExpansion) const
     return frustum;
 }
 
-static bool appendZIntersects(const QDoubleVector3D &start,
-                                               const QDoubleVector3D &end,
-                                               double z,
-                                               QVector<QDoubleVector3D> &results)
+static bool appendZIntersects(const QDoubleVector3D &start, const QDoubleVector3D &end, double z,
+                              QList<QDoubleVector3D> &results)
 {
     if (start.z() == end.z()) {
         return false;
@@ -400,7 +398,7 @@ QPair<PolygonVector, PolygonVector> QGeoCameraTilesPrivate::splitPolygonAtAxisVa
         return QPair<PolygonVector, PolygonVector>(polygonBelow, polygonAbove);
     }
 
-    QVector<int> comparisons = QVector<int>(polygon.size());
+    QList<int> comparisons = QList<int>(polygon.size());
 
     for (int i = 0; i < size; ++i) {
         double v = polygon.at(i).get(axis);
@@ -664,8 +662,8 @@ QSet<QGeoTileSpec> QGeoCameraTilesPrivate::tilesFromPolygon(const PolygonVector
     if (numPoints == 0)
         return QSet<QGeoTileSpec>();
 
-    QVector<int> tilesX(polygon.size());
-    QVector<int> tilesY(polygon.size());
+    QList<int> tilesX(polygon.size());
+    QList<int> tilesY(polygon.size());
 
     // grab tiles at the corners of the polygon
     for (int i = 0; i < numPoints; ++i) {
diff --git a/src/location/maps/qgeocameratiles_p_p.h b/src/location/maps/qgeocameratiles_p_p.h
index 846d95f2..17e0036d 100644
--- a/src/location/maps/qgeocameratiles_p_p.h
+++ b/src/location/maps/qgeocameratiles_p_p.h
@@ -55,7 +55,7 @@
 #include "qgeocameradata_p.h"
 #include "qgeotilespec_p.h"
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
@@ -73,7 +73,7 @@ struct Q_LOCATION_PRIVATE_EXPORT Frustum
     QDoubleVector3D bottomRightFar;
 };
 
-typedef QVector<QDoubleVector3D> PolygonVector;
+typedef QList<QDoubleVector3D> PolygonVector;
 
 class Q_LOCATION_PRIVATE_EXPORT QGeoCameraTilesPrivate
 {
diff --git a/src/location/maps/qgeotiledmapscene.cpp b/src/location/maps/qgeotiledmapscene.cpp
index 18d92b00..f345e555 100644
--- a/src/location/maps/qgeotiledmapscene.cpp
+++ b/src/location/maps/qgeotiledmapscene.cpp
@@ -625,7 +625,7 @@ QSGNode *QGeoTiledMapScene::updateSceneGraph(QSGNode *oldNode, QQuickWindow *win
 
     // Evicting loZL tiles temporarily used in place of hiZL ones
     if (d->m_updatedTextures.size()) {
-        const QVector<QGeoTileSpec> &toRemove = d->m_updatedTextures;
+        const QList<QGeoTileSpec> &toRemove = d->m_updatedTextures;
         for (const QGeoTileSpec &s : toRemove) {
             if (mapRoot->tiles->tiles.contains(s))
                 delete mapRoot->tiles->tiles.take(s);
diff --git a/src/location/maps/qgeotiledmapscene_p_p.h b/src/location/maps/qgeotiledmapscene_p_p.h
index 5d98abd5..44827884 100644
--- a/src/location/maps/qgeotiledmapscene_p_p.h
+++ b/src/location/maps/qgeotiledmapscene_p_p.h
@@ -171,7 +171,7 @@ public:
     double m_mapEdgeSize;
 
     QHash<QGeoTileSpec, QSharedPointer<QGeoTileTexture> > m_textures;
-    QVector<QGeoTileSpec> m_updatedTextures;
+    QList<QGeoTileSpec> m_updatedTextures;
 
     // tilesToGrid transform
     int m_minTileX; // the minimum tile index, i.e. 0 to sideLength which is 1<< zoomLevel