summaryrefslogtreecommitdiff
path: root/src/location/labs
diff options
context:
space:
mode:
Diffstat (limited to 'src/location/labs')
-rw-r--r--src/location/labs/qmapobjectview.cpp2
-rw-r--r--src/location/labs/qmapobjectview_p.h10
-rw-r--r--src/location/labs/qmapobjectview_p_p.h2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/location/labs/qmapobjectview.cpp b/src/location/labs/qmapobjectview.cpp
index 54d384fb..e0a6a294 100644
--- a/src/location/labs/qmapobjectview.cpp
+++ b/src/location/labs/qmapobjectview.cpp
@@ -322,7 +322,7 @@ void QMapObjectView::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
flushDelegateModel();
} else {
// Remove map objects from the back to the front to retain the mapping to what is received from the changesets
- const QVector<QQmlChangeSet::Change> &removes = changeSet.removes();
+ const QList<QQmlChangeSet::Change> &removes = changeSet.removes();
std::map<int, int> mapRemoves;
for (int i = 0; i < removes.size(); i++)
mapRemoves.insert(std::pair<int, int>(removes.at(i).start(), i));
diff --git a/src/location/labs/qmapobjectview_p.h b/src/location/labs/qmapobjectview_p.h
index be5801d3..46b5a378 100644
--- a/src/location/labs/qmapobjectview_p.h
+++ b/src/location/labs/qmapobjectview_p.h
@@ -51,7 +51,7 @@
#include <QtLocation/private/qlocationglobal_p.h>
#include <QtLocation/private/qgeomapobject_p.h>
#include <QQmlComponent>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -104,9 +104,11 @@ protected:
void flushUserAddedMapObjects();
QQmlDelegateModel *m_delegateModel = nullptr;
- QVector<QPointer<QGeoMapObject>> m_instantiatedMapObjects;
- QVector<QPointer<QGeoMapObject>> m_pendingMapObjects; // for items instantiated before the map is set
- QVector<QPointer<QGeoMapObject>> m_userAddedMapObjects; // A third list containing the objects dynamically added through addMapObject
+ QList<QPointer<QGeoMapObject>> m_instantiatedMapObjects;
+ QList<QPointer<QGeoMapObject>>
+ m_pendingMapObjects; // for items instantiated before the map is set
+ QList<QPointer<QGeoMapObject>> m_userAddedMapObjects; // A third list containing the objects
+ // dynamically added through addMapObject
bool m_creatingObject = false;
};
diff --git a/src/location/labs/qmapobjectview_p_p.h b/src/location/labs/qmapobjectview_p_p.h
index 55f45f67..8c368231 100644
--- a/src/location/labs/qmapobjectview_p_p.h
+++ b/src/location/labs/qmapobjectview_p_p.h
@@ -52,7 +52,7 @@
#include <QtLocation/private/qlocationglobal_p.h>
#include <QtLocation/private/qgeomapobject_p_p.h>
#include <QPointer>
-#include <QVector>
+#include <QList>
#include <QQmlComponent>
QT_BEGIN_NAMESPACE