diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-24 11:57:21 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:11:24 +0200 |
| commit | ffee803f1099f85082a152791a7a3b261947a751 (patch) | |
| tree | 307766f137312bad751a9c35bd3281d1772568ac /src/location/maps/qgeocameratiles.cpp | |
| parent | 3794e0c252a8e7a0288d3fb74dde6f5fdc09950d (diff) | |
| download | qtlocation-ffee803f1099f85082a152791a7a3b261947a751.tar.gz | |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Iefd2fb627602ef4744d80858eee72a089ef5f4ec
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/location/maps/qgeocameratiles.cpp')
| -rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 14 |
1 files changed, 6 insertions, 8 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) { |