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>

23 files changed, 48 insertions, 50 deletions

diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 9f58f5899..e8a8a878c 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -96,7 +96,7 @@ Qt3DCore::QNodeId FrameGraphNode::parentId() const
     return m_parentId;
 }
 
-QVector<Qt3DCore::QNodeId> FrameGraphNode::childrenIds() const
+QList<Qt3DCore::QNodeId> FrameGraphNode::childrenIds() const
 {
     return m_childrenIds;
 }
@@ -106,9 +106,9 @@ FrameGraphNode *FrameGraphNode::parent() const
     return m_manager->lookupNode(m_parentId);
 }
 
-QVector<FrameGraphNode *> FrameGraphNode::children() const
+QList<FrameGraphNode *> FrameGraphNode::children() const
 {
-    QVector<FrameGraphNode *> children;
+    QList<FrameGraphNode *> children;
     children.reserve(m_childrenIds.size());
 
     for (Qt3DCore::QNodeId id : m_childrenIds) {
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index de0969786..1993c89fe 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -58,7 +58,7 @@
 #include <Qt3DRender/private/managers_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 #include <qglobal.h>
-#include <QVector>
+#include <QList>
 
 // Windows had the smart idea of using a #define MemoryBarrier
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms684208(v=vs.85).aspx
@@ -115,10 +115,10 @@ public:
     void setParentId(Qt3DCore::QNodeId parentId);
 
     Qt3DCore::QNodeId parentId() const;
-    QVector<Qt3DCore::QNodeId> childrenIds() const;
+    QList<Qt3DCore::QNodeId> childrenIds() const;
 
     FrameGraphNode *parent() const;
-    QVector<FrameGraphNode *> children() const;
+    QList<FrameGraphNode *> children() const;
 
     void cleanup();
 
@@ -130,7 +130,7 @@ protected:
 private:
     FrameGraphNodeType m_nodeType;
     Qt3DCore::QNodeId m_parentId;
-    QVector<Qt3DCore::QNodeId> m_childrenIds;
+    QList<Qt3DCore::QNodeId> m_childrenIds;
     FrameGraphManager *m_manager;
 
     friend class FrameGraphVisitor;
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index 79f0430f6..a5a47d711 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -94,7 +94,7 @@ void FrameGraphVisitor::visit(Render::FrameGraphNode *node)
 
     // Recurse to children (if we have any), otherwise if this is a leaf node,
     // initiate a rendering from the current camera
-    const QVector<Qt3DCore::QNodeId> fgChildIds = node->childrenIds();
+    const QList<Qt3DCore::QNodeId> fgChildIds = node->childrenIds();
 
     for (const Qt3DCore::QNodeId fgChildId : fgChildIds)
         visit(m_manager->lookupNode(fgChildId));
diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h
index c48a003b4..151c11949 100644
--- a/src/render/framegraph/framegraphvisitor_p.h
+++ b/src/render/framegraph/framegraphvisitor_p.h
@@ -56,8 +56,6 @@
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
 
-#include <QVector>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 1c2829399..53b362f01 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/qrenderpassfilter.h>
 
 #include <Qt3DCore/QNode>
-#include <QVector>
+#include <QList>
 #include <QQueue>
 
 using namespace Qt3DCore;
@@ -62,7 +62,7 @@ QString dumpNode(const Qt3DRender::QFrameGraphNode *n) {
     return res;
 }
 
-QString dumpNodeFilters(const Qt3DRender::QFrameGraphNode *n, const QVector<Qt3DRender::QFilterKey*> &filters) {
+QString dumpNodeFilters(const Qt3DRender::QFrameGraphNode *n, const QList<Qt3DRender::QFilterKey *> &filters) {
     QString res = QLatin1String(n->metaObject()->className());
     if (!n->objectName().isEmpty())
         res += QString(QLatin1String(" (%1)")).arg(n->objectName());
@@ -100,7 +100,7 @@ QStringList dumpFG(const Qt3DCore::QNode *n, int level = 0)
 struct HierarchyFGNode
 {
     const Qt3DRender::QFrameGraphNode *root;
-    QVector<QSharedPointer<HierarchyFGNode>> children;
+    QList<QSharedPointer<HierarchyFGNode>> children;
 };
 using HierarchyFGNodePtr = QSharedPointer<HierarchyFGNode>;
 
@@ -129,7 +129,7 @@ HierarchyFGNodePtr buildFGHierarchy(const Qt3DCore::QNode *n, HierarchyFGNodePtr
     return lastFGParent;
 }
 
-void findFGLeaves(const HierarchyFGNodePtr root, QVector<const Qt3DRender::QFrameGraphNode *> &fgLeaves)
+void findFGLeaves(const HierarchyFGNodePtr root, QList<const Qt3DRender::QFrameGraphNode *> &fgLeaves)
 {
     const auto children = root->children;
     for (const auto &child : children)
@@ -145,7 +145,7 @@ void dumpFGPaths(const Qt3DRender::QFrameGraphNode *n, QStringList &result)
     const HierarchyFGNodePtr rootHFg = buildFGHierarchy(n);
 
     // Gather FG leaves
-    QVector<const Qt3DRender::QFrameGraphNode *> fgLeaves;
+    QList<const Qt3DRender::QFrameGraphNode *> fgLeaves;
     findFGLeaves(rootHFg, fgLeaves);
 
     // Traverse back to root
@@ -169,7 +169,7 @@ void dumpFGFilterState(const Qt3DRender::QFrameGraphNode *n, QStringList &result
     const HierarchyFGNodePtr rootHFg = buildFGHierarchy(n);
 
     // Gather FG leaves
-    QVector<const Qt3DRender::QFrameGraphNode *> fgLeaves;
+    QList<const Qt3DRender::QFrameGraphNode *> fgLeaves;
     findFGLeaves(rootHFg, fgLeaves);
 
     // Traverse back to root
@@ -374,10 +374,10 @@ QFrameGraphNode *QFrameGraphNode::parentFrameGraphNode() const
  * If any of these are not frame graph nodes, they will be further searched as
  * if they were direct children of this node.
  */
-QVector<QFrameGraphNode *> QFrameGraphNodePrivate::childFrameGraphNodes() const
+QList<QFrameGraphNode *> QFrameGraphNodePrivate::childFrameGraphNodes() const
 {
     Q_Q(const QFrameGraphNode);
-    QVector<QFrameGraphNode *> result;
+    QList<QFrameGraphNode *> result;
     QQueue<QNode *> queue;
     queue.append(q->childNodes().toList());
     result.reserve(queue.size());
diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h
index 95c50bbf7..cba1e5c10 100644
--- a/src/render/framegraph/qframegraphnode_p.h
+++ b/src/render/framegraph/qframegraphnode_p.h
@@ -65,7 +65,7 @@ class QFrameGraphNodePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QFrameGraphNodePrivate();
-    QVector<QFrameGraphNode *> childFrameGraphNodes() const;
+    QList<QFrameGraphNode *> childFrameGraphNodes() const;
 
     static QFrameGraphNodePrivate *get(QFrameGraphNode *node) { return node->d_func(); }
     static const QFrameGraphNodePrivate *get(const QFrameGraphNode *node) { return node->d_func(); }
diff --git a/src/render/framegraph/qlayerfilter_p.h b/src/render/framegraph/qlayerfilter_p.h
index ded2ed71e..963fcd51f 100644
--- a/src/render/framegraph/qlayerfilter_p.h
+++ b/src/render/framegraph/qlayerfilter_p.h
@@ -66,7 +66,7 @@ public:
     QLayerFilterPrivate();
 
     Q_DECLARE_PUBLIC(QLayerFilter)
-    QVector<QLayer*> m_layers;
+    QList<QLayer *> m_layers;
     QLayerFilter::FilterMode m_filterMode;
 };
 
diff --git a/src/render/framegraph/qrendercapture_p.h b/src/render/framegraph/qrendercapture_p.h
index 7c6577524..f6d7c7a30 100644
--- a/src/render/framegraph/qrendercapture_p.h
+++ b/src/render/framegraph/qrendercapture_p.h
@@ -68,9 +68,9 @@ class QRenderCapturePrivate : public QFrameGraphNodePrivate
 public:
     QRenderCapturePrivate();
     ~QRenderCapturePrivate();
-    QVector<QRenderCaptureReply *> m_waitingReplies;
+    QList<QRenderCaptureReply *> m_waitingReplies;
     QMutex m_mutex;
-    mutable QVector<QRenderCaptureRequest> m_pendingRequests;
+    mutable QList<QRenderCaptureRequest> m_pendingRequests;
 
     QRenderCaptureReply *createReply(int captureId);
     QRenderCaptureReply *takeReply(int captureId);
diff --git a/src/render/framegraph/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h
index 1a6d74bb9..bbca70297 100644
--- a/src/render/framegraph/qrenderpassfilter_p.h
+++ b/src/render/framegraph/qrenderpassfilter_p.h
@@ -68,8 +68,8 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderPassFilter)
     QString m_renderPassName;
-    QVector<QFilterKey *> m_matchList;
-    QVector<QParameter *> m_parameters;
+    QList<QFilterKey *> m_matchList;
+    QList<QParameter *> m_parameters;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrenderstateset_p.h b/src/render/framegraph/qrenderstateset_p.h
index 192d807c2..b251ad267 100644
--- a/src/render/framegraph/qrenderstateset_p.h
+++ b/src/render/framegraph/qrenderstateset_p.h
@@ -66,7 +66,7 @@ public:
     QRenderStateSetPrivate();
 
     Q_DECLARE_PUBLIC(QRenderStateSet)
-    QVector<QRenderState *> m_renderStates;
+    QList<QRenderState *> m_renderStates;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendertargetselector_p.h b/src/render/framegraph/qrendertargetselector_p.h
index 2130a06a2..d48d88f84 100644
--- a/src/render/framegraph/qrendertargetselector_p.h
+++ b/src/render/framegraph/qrendertargetselector_p.h
@@ -67,7 +67,7 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderTargetSelector)
     QRenderTarget *m_target;
-    QVector<QRenderTargetOutput::AttachmentPoint> m_outputs;
+    QList<QRenderTargetOutput::AttachmentPoint> m_outputs;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qsortpolicy_p.h b/src/render/framegraph/qsortpolicy_p.h
index 796a4f7f0..31b62a071 100644
--- a/src/render/framegraph/qsortpolicy_p.h
+++ b/src/render/framegraph/qsortpolicy_p.h
@@ -64,7 +64,7 @@ class QSortPolicyPrivate : public QFrameGraphNodePrivate
 public:
     QSortPolicyPrivate();
     Q_DECLARE_PUBLIC(QSortPolicy)
-    QVector<QSortPolicy::SortType> m_sortTypes;
+    QList<QSortPolicy::SortType> m_sortTypes;
 };
 
 } // namespace Qt3DRender
@@ -77,7 +77,7 @@ namespace {
     }
 
     template<class From, class To>
-    void transformVector(const QVector<From> &input, QVector<To> &output)
+    void transformVector(const QList<From> &input, QList<To> &output)
     {
         Q_ASSERT(output.isEmpty());
 
diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h
index 7ab6789fb..4de4a6377 100644
--- a/src/render/framegraph/qtechniquefilter_p.h
+++ b/src/render/framegraph/qtechniquefilter_p.h
@@ -66,8 +66,8 @@ public :
     QTechniqueFilterPrivate();
 
     Q_DECLARE_PUBLIC(QTechniqueFilter)
-    QVector<QFilterKey *> m_matchList;
-    QVector<QParameter *> m_parameters;
+    QList<QFilterKey *> m_matchList;
+    QList<QParameter *> m_parameters;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/rendercapture_p.h b/src/render/framegraph/rendercapture_p.h
index f2a2a55b7..7eb4d5745 100644
--- a/src/render/framegraph/rendercapture_p.h
+++ b/src/render/framegraph/rendercapture_p.h
@@ -72,8 +72,8 @@ public:
 
 private:
 
-    QVector<QRenderCaptureRequest> m_requestedCaptures;
-    QVector<RenderCaptureDataPtr> m_renderCaptureData;
+    QList<QRenderCaptureRequest> m_requestedCaptures;
+    QList<RenderCaptureDataPtr> m_renderCaptureData;
     mutable QMutex m_mutex;
 };
 
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index bcec38fb6..9fb87ba01 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -82,7 +82,7 @@ void RenderPassFilter::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
 }
 
 
-QVector<Qt3DCore::QNodeId> RenderPassFilter::filters() const
+QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const
 {
     return m_filters;
 }
@@ -98,7 +98,7 @@ void RenderPassFilter::removeFilter(Qt3DCore::QNodeId criterionId)
     m_filters.removeOne(criterionId);
 }
 
-QVector<Qt3DCore::QNodeId> RenderPassFilter::parameters() const
+QList<Qt3DCore::QNodeId> RenderPassFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index c9084573e..3cc481db9 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -72,14 +72,14 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT RenderPassFilter : public Render::FrameGra
 public:
     RenderPassFilter();
 
-    QVector<Qt3DCore::QNodeId> filters() const;
-    QVector<Qt3DCore::QNodeId> parameters() const;
+    QList<Qt3DCore::QNodeId> filters() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
     void appendFilter(Qt3DCore::QNodeId criterionId);
     void removeFilter(Qt3DCore::QNodeId criterionId);
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
 private:
-    QVector<Qt3DCore::QNodeId> m_filters;
+    QList<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };
 
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 04032045a..3234c75bb 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -69,11 +69,11 @@ public:
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
     Qt3DCore::QNodeId renderTargetUuid() const { return m_renderTargetUuid; }
-    QVector<QRenderTargetOutput::AttachmentPoint> outputs() const { return m_outputs; }
+    QList<QRenderTargetOutput::AttachmentPoint> outputs() const { return m_outputs; }
 
 private:
     Qt3DCore::QNodeId m_renderTargetUuid;
-    QVector<QRenderTargetOutput::AttachmentPoint> m_outputs;
+    QList<QRenderTargetOutput::AttachmentPoint> m_outputs;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp
index 5c61966c0..01363dc36 100644
--- a/src/render/framegraph/sortpolicy.cpp
+++ b/src/render/framegraph/sortpolicy.cpp
@@ -67,7 +67,7 @@ void SortPolicy::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     }
 }
 
-QVector<QSortPolicy::SortType> SortPolicy::sortTypes() const
+QList<QSortPolicy::SortType> SortPolicy::sortTypes() const
 {
     return m_sortTypes;
 }
diff --git a/src/render/framegraph/sortpolicy_p.h b/src/render/framegraph/sortpolicy_p.h
index 2015adf87..3a1cecdc5 100644
--- a/src/render/framegraph/sortpolicy_p.h
+++ b/src/render/framegraph/sortpolicy_p.h
@@ -67,10 +67,10 @@ public:
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
-    QVector<Qt3DRender::QSortPolicy::SortType> sortTypes() const;
+    QList<Qt3DRender::QSortPolicy::SortType> sortTypes() const;
 
 private:
-    QVector<Qt3DRender::QSortPolicy::SortType> m_sortTypes;
+    QList<Qt3DRender::QSortPolicy::SortType> m_sortTypes;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index b3d8a95bb..63f6a19d1 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -61,7 +61,7 @@ StateSetNode::~StateSetNode()
 {
 }
 
-QVector<QNodeId> StateSetNode::renderStates() const
+QList<QNodeId> StateSetNode::renderStates() const
 {
     return m_renderStates;
 }
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 618b52338..04f7a248c 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -66,7 +66,7 @@ public:
     ~StateSetNode();
 
     inline bool hasRenderStates() const { return !m_renderStates.empty(); }
-    QVector<Qt3DCore::QNodeId> renderStates() const;
+    QList<Qt3DCore::QNodeId> renderStates() const;
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
@@ -75,7 +75,7 @@ protected:
     void removeRenderState(Qt3DCore::QNodeId renderStateId);
 
 private:
-    QVector<Qt3DCore::QNodeId> m_renderStates;
+    QList<Qt3DCore::QNodeId> m_renderStates;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index b3b70e9cb..b4df48e56 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -82,12 +82,12 @@ void TechniqueFilter::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     }
 }
 
-QVector<Qt3DCore::QNodeId> TechniqueFilter::parameters() const
+QList<Qt3DCore::QNodeId> TechniqueFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-QVector<Qt3DCore::QNodeId> TechniqueFilter::filters() const
+QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const
 {
     return m_filters;
 }
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 2e71e31d4..87a116e7b 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -76,16 +76,16 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT TechniqueFilter
 public:
     TechniqueFilter();
 
-    QVector<Qt3DCore::QNodeId> parameters() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
 
-    QVector<Qt3DCore::QNodeId> filters() const;
+    QList<Qt3DCore::QNodeId> filters() const;
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
 private:
     void appendFilter(Qt3DCore::QNodeId criterionId);
     void removeFilter(Qt3DCore::QNodeId criterionId);
 
-    QVector<Qt3DCore::QNodeId> m_filters;
+    QList<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };