Use QList instead of QVector in render

Use list-initialization.

Task-number: QTBUG-84469
Change-Id: I826450646fc3c7118cae49c22a28058f47770e13
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 19 insertions, 19 deletions

diff --git a/src/render/frontend/qlevelofdetail_p.h b/src/render/frontend/qlevelofdetail_p.h
index 429128427..9c485936e 100644
--- a/src/render/frontend/qlevelofdetail_p.h
+++ b/src/render/frontend/qlevelofdetail_p.h
@@ -77,7 +77,7 @@ public:
     QCamera *m_camera;
     int m_currentIndex;
     QLevelOfDetail::ThresholdType m_thresholdType;
-    QVector<qreal> m_thresholds;
+    QList<qreal> m_thresholds;
     QLevelOfDetailBoundingSphere m_volumeOverride;
 };
 
@@ -86,7 +86,7 @@ struct QLevelOfDetailData
     Qt3DCore::QNodeId camera;
     int currentIndex;
     QLevelOfDetail::ThresholdType thresholdType;
-    QVector<qreal> thresholds;
+    QList<qreal> thresholds;
     QLevelOfDetailBoundingSphere volumeOverride;
 };
 
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 8f30d46f0..bd6d7d831 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -208,7 +208,7 @@ QString dumpNode(const Qt3DCore::QEntity *n) {
     return formatNode(n);
 }
 
-QString dumpNodeFilters(const QString &filterType, const QVector<Qt3DRender::QFilterKey*> &filters) {
+QString dumpNodeFilters(const QString &filterType, const QList<Qt3DRender::QFilterKey *> &filters) {
     QString res;
 
     QStringList kv;
@@ -335,7 +335,7 @@ QRenderAspectPrivate::~QRenderAspectPrivate()
 
 QRenderAspectPrivate *QRenderAspectPrivate::findPrivate(Qt3DCore::QAspectEngine *engine)
 {
-    const QVector<QAbstractAspect*> aspects = engine->aspects();
+    const QList<QAbstractAspect *> aspects = engine->aspects();
     for (QAbstractAspect* aspect : aspects) {
         QRenderAspect *renderAspect = qobject_cast<QRenderAspect *>(aspect);
         if (renderAspect)
@@ -686,7 +686,7 @@ std::vector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
         d->m_updateLevelOfDetailJob->setFrameGraphRoot(d->m_renderer->frameGraphRoot());
 
         // Launch skeleton loader jobs once all loading jobs have completed.
-        const QVector<Render::HSkeleton> skeletonsToLoad =
+        const QList<Render::HSkeleton> skeletonsToLoad =
                 manager->skeletonManager()->takeDirtySkeletons(Render::SkeletonManager::SkeletonDataDirty);
         for (const auto &skeletonHandle : skeletonsToLoad) {
             auto loadSkeletonJob = Render::LoadSkeletonJobPtr::create(skeletonHandle);
@@ -879,7 +879,7 @@ void QRenderAspect::onUnregistered()
 std::vector<Qt3DCore::QAspectJobPtr> QRenderAspectPrivate::createGeometryRendererJobs() const
 {
     Render::GeometryRendererManager *geomRendererManager = m_nodeManagers->geometryRendererManager();
-    const QVector<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers();
+    const QList<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers();
     std::vector<QAspectJobPtr> dirtyGeometryRendererJobs;
     dirtyGeometryRendererJobs.reserve(dirtyGeometryRenderers.size());
 
@@ -990,9 +990,9 @@ void QRenderAspectPrivate::loadRenderPlugin(const QString &pluginName)
     }
 }
 
-QVector<QString> QRenderAspectPrivate::m_pluginConfig;
+QList<QString> QRenderAspectPrivate::m_pluginConfig;
 QMutex QRenderAspectPrivate::m_pluginLock;
-QVector<QRenderAspectPrivate *> QRenderAspectPrivate::m_instances;
+QList<QRenderAspectPrivate *> QRenderAspectPrivate::m_instances;
 
 void QRenderAspectPrivate::configurePlugin(const QString &plugin)
 {
diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h
index 8df8bbca5..71dcf0468 100644
--- a/src/render/frontend/qrenderaspect_p.h
+++ b/src/render/frontend/qrenderaspect_p.h
@@ -131,8 +131,8 @@ public:
     bool m_initialized;
     const bool m_renderAfterJobs;
     QList<QSceneImporter *> m_sceneImporter;
-    QVector<QString> m_loadedPlugins;
-    QVector<Render::QRenderPlugin *> m_renderPlugins;
+    QList<QString> m_loadedPlugins;
+    QList<Render::QRenderPlugin *> m_renderPlugins;
     Render::OffscreenSurfaceHelper *m_offscreenHelper;
     QScreen *m_screen = nullptr;
 
@@ -152,8 +152,8 @@ public:
     QRenderAspect::SubmissionType m_submissionType;
 
     static QMutex m_pluginLock;
-    static QVector<QString> m_pluginConfig;
-    static QVector<QRenderAspectPrivate *> m_instances;
+    static QList<QString> m_pluginConfig;
+    static QList<QRenderAspectPrivate *> m_instances;
     static void configurePlugin(const QString &plugin);
 };
 
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index b08477478..bb5b751df 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -67,7 +67,7 @@ public:
     QRenderTargetPrivate();
 
     Q_DECLARE_PUBLIC(QRenderTarget)
-    QVector<QRenderTargetOutput *> m_outputs;
+    QList<QRenderTargetOutput *> m_outputs;
 };
 
 struct QRenderTargetData
diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp
index 0caeed9f1..7cf132926 100644
--- a/src/render/frontend/sphere.cpp
+++ b/src/render/frontend/sphere.cpp
@@ -93,7 +93,7 @@ bool intersectRaySphere(const Qt3DRender::RayCasting::QRay3D &ray, const Qt3DRen
     return true;
 }
 
-inline void constructRitterSphere(Qt3DRender::Render::Sphere &s, const QVector<Vector3D> &points)
+inline void constructRitterSphere(Qt3DRender::Render::Sphere &s, const QList<Vector3D> &points)
 {
     //def bounding_sphere(points):
     //  dist = lambda a,b: ((a[0] - b[0])**2 + (a[1] - b[1])**2 + (a[2] - b[2])**2)**0.5
@@ -130,14 +130,14 @@ namespace Render {
 
 const float Sphere::ms_epsilon = 1.0e-7f;
 
-Sphere Sphere::fromPoints(const QVector<Vector3D> &points)
+Sphere Sphere::fromPoints(const QList<Vector3D> &points)
 {
     Sphere s;
     s.initializeFromPoints(points);
     return s;
 }
 
-void Sphere::initializeFromPoints(const QVector<Vector3D> &points)
+void Sphere::initializeFromPoints(const QList<Vector3D> &points)
 {
     if (!points.isEmpty())
         constructRitterSphere(*this, points);
diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h
index 448704cf4..c4ea34b50 100644
--- a/src/render/frontend/sphere_p.h
+++ b/src/render/frontend/sphere_p.h
@@ -86,9 +86,9 @@ public:
     float radius() const override;
 
     void clear();
-    void initializeFromPoints(const QVector<Vector3D> &points);
+    void initializeFromPoints(const QList<Vector3D> &points);
     void expandToContain(const Vector3D &point);
-    inline void expandToContain(const QVector<Vector3D> &points)
+    inline void expandToContain(const QList<Vector3D> &points)
     {
         for (const Vector3D &p : points)
             expandToContain(p);
@@ -107,7 +107,7 @@ public:
     bool intersects(const RayCasting::QRay3D &ray, Vector3D *q, Vector3D *uvw = nullptr) const final;
     Type type() const final;
 
-    static Sphere fromPoints(const QVector<Vector3D> &points);
+    static Sphere fromPoints(const QList<Vector3D> &points);
 
 private:
     Vector3D m_center;