summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-24 11:57:21 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-25 10:11:24 +0200
commitffee803f1099f85082a152791a7a3b261947a751 (patch)
tree307766f137312bad751a9c35bd3281d1772568ac /src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
parent3794e0c252a8e7a0288d3fb74dde6f5fdc09950d (diff)
downloadqtlocation-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/declarativemaps/qdeclarativepolygonmapitem_p_p.h')
-rw-r--r--src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
index 8d566e69..12bd4b86 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
@@ -67,7 +67,7 @@
#include <QtGui/QMatrix4x4>
#include <QColor>
#include <QList>
-#include <QVector>
+#include <QList>
#include <QtCore/QScopedValueRollback>
QT_BEGIN_NAMESPACE
@@ -117,9 +117,8 @@ public:
void allocateAndFillPolygon(QSGGeometry *geom) const
{
-
- const QVector<QDeclarativeGeoMapItemUtils::vec2> &vx = m_screenVertices;
- const QVector<quint32> &ix = m_screenIndices;
+ const QList<QDeclarativeGeoMapItemUtils::vec2> &vx = m_screenVertices;
+ const QList<quint32> &ix = m_screenIndices;
geom->allocate(vx.size(), ix.size());
if (geom->indexType() == QSGGeometry::UnsignedShortType) {
@@ -137,10 +136,10 @@ public:
pts[i].set(vx[i].x, vx[i].y);
}
- QVector<QDeclarativeGeoMapItemUtils::vec2> m_screenVertices;
- QVector<quint32> m_screenIndices;
+ QList<QDeclarativeGeoMapItemUtils::vec2> m_screenVertices;
+ QList<quint32> m_screenIndices;
QDoubleVector2D m_bboxLeftBoundWrapped;
- QVector<WrappedPolygon> m_wrappedPolygons;
+ QList<WrappedPolygon> m_wrappedPolygons;
int m_wrapOffset;
};