Restore use of QVector in private API

Facilitates building against Qt 5.15.
Will migrate to std::vector over time.

Change-Id: I5db14c9ea95b38e4b2d596d7397fef76f6baf118
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

7 files changed, 21 insertions, 21 deletions

diff --git a/src/render/backend/uniform.cpp b/src/render/backend/uniform.cpp
index 92fb077f7..193f92080 100644
--- a/src/render/backend/uniform.cpp
+++ b/src/render/backend/uniform.cpp
@@ -277,7 +277,7 @@ UniformValue UniformValue::fromVariant(const QVariant &variant)
 }
 
 template<>
-void UniformValue::setData<QMatrix4x4>(const QList<QMatrix4x4> &v)
+void UniformValue::setData<QMatrix4x4>(const QVector<QMatrix4x4> &v)
 {
     m_data.resize(16 * v.size());
     m_valueType = ScalarValue;
diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h
index b1ddcf01c..24bbcd76c 100644
--- a/src/render/backend/uniform_p.h
+++ b/src/render/backend/uniform_p.h
@@ -162,7 +162,7 @@ public:
     }
 #endif
 
-    UniformValue(const QList<QMatrix4x4> &v)
+    UniformValue(const QVector<QMatrix4x4> &v)
         : m_data(16 * v.size())
     {
         int offset = 0;
@@ -193,7 +193,7 @@ public:
     UniformType storedType() const { return m_storedType; }
 
     template<typename T>
-    void setData(const QList<T> &v)
+    void setData(const QVector<T> &v)
     {
         m_elementByteSize = sizeof(T);
         m_data.resize(v.size() * sizeof(T) / sizeof(float));
@@ -242,7 +242,7 @@ private:
 };
 
 template<>
-Q_3DRENDERSHARED_PRIVATE_EXPORT void UniformValue::setData<QMatrix4x4>(const QList<QMatrix4x4> &v);
+Q_3DRENDERSHARED_PRIVATE_EXPORT void UniformValue::setData<QMatrix4x4>(const QVector<QMatrix4x4> &v);
 
 } // namespace Render
 } // namespace Qt3DRender
diff --git a/src/render/geometry/gltfskeletonloader_p.h b/src/render/geometry/gltfskeletonloader_p.h
index 025c632ed..c52c71951 100644
--- a/src/render/geometry/gltfskeletonloader_p.h
+++ b/src/render/geometry/gltfskeletonloader_p.h
@@ -170,11 +170,11 @@ private:
 
     QJsonDocument m_json;
     QString m_basePath;
-    QList<BufferData> m_bufferDatas;
-    QList<BufferView> m_bufferViews;
-    QList<AccessorData> m_accessors;
-    QList<Skin> m_skins;
-    QList<Node> m_nodes;
+    QVector<BufferData> m_bufferDatas;
+    QVector<BufferView> m_bufferViews;
+    QVector<AccessorData> m_accessors;
+    QVector<Skin> m_skins;
+    QVector<Node> m_nodes;
 };
 
 } // namespace Render
diff --git a/src/render/geometry/skeleton.cpp b/src/render/geometry/skeleton.cpp
index 8a3aeccc8..828382cd0 100644
--- a/src/render/geometry/skeleton.cpp
+++ b/src/render/geometry/skeleton.cpp
@@ -171,10 +171,10 @@ void Skeleton::setLocalPose(HJoint jointHandle, const Qt3DCore::Sqt &localPose)
     m_skeletonData.localPoses[jointIndex] = localPose;
 }
 
-QList<QMatrix4x4> Skeleton::calculateSkinningMatrixPalette()
+QVector<QMatrix4x4> Skeleton::calculateSkinningMatrixPalette()
 {
-    const QList<Sqt> &localPoses = m_skeletonData.localPoses;
-    QList<JointInfo> &joints = m_skeletonData.joints;
+    const QVector<Sqt> &localPoses = m_skeletonData.localPoses;
+    QVector<JointInfo> &joints = m_skeletonData.joints;
     for (int i = 0; i < m_skeletonData.joints.size(); ++i) {
         // Calculate the global pose of this joint
         JointInfo &joint = joints[i];
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index 93e72ec77..4c6c038c7 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -102,15 +102,15 @@ public:
     QString name() const { return m_name; }
 
     int jointCount() const { return m_skeletonData.joints.size(); }
-    QList<JointInfo> joints() const { return m_skeletonData.joints; }
-    QList<QString> jointNames() const { return m_skeletonData.jointNames; }
-    QList<Qt3DCore::Sqt> localPoses() const { return m_skeletonData.localPoses; }
+    QVector<JointInfo> joints() const { return m_skeletonData.joints; }
+    QVector<QString> jointNames() const { return m_skeletonData.jointNames; }
+    QVector<Qt3DCore::Sqt> localPoses() const { return m_skeletonData.localPoses; }
 
     Qt3DCore::QNodeId rootJointId() const { return m_rootJointId; }
 
     // Called from jobs
     void setLocalPose(HJoint jointHandle, const Qt3DCore::Sqt &localPose);
-    QList<QMatrix4x4> calculateSkinningMatrixPalette();
+    QVector<QMatrix4x4> calculateSkinningMatrixPalette();
 
     void clearData();
     void setSkeletonData(const SkeletonData &data);
@@ -124,7 +124,7 @@ public:
 #endif
 
 private:
-    QList<QMatrix4x4> m_skinningPalette;
+    QVector<QMatrix4x4> m_skinningPalette;
 
     // QSkeletonLoader Properties
     QUrl m_source;
diff --git a/src/render/geometry/skeletondata_p.h b/src/render/geometry/skeletondata_p.h
index 7106c0d4d..70a6f650d 100644
--- a/src/render/geometry/skeletondata_p.h
+++ b/src/render/geometry/skeletondata_p.h
@@ -86,9 +86,9 @@ struct Q_AUTOTEST_EXPORT SkeletonData
 
     void reserve(int size);
 
-    QList<JointInfo> joints;
-    QList<Qt3DCore::Sqt> localPoses;
-    QList<QString> jointNames;
+    QVector<JointInfo> joints;
+    QVector<Qt3DCore::Sqt> localPoses;
+    QVector<QString> jointNames;
     QHash<HJoint, int> jointIndices;
 };
 
diff --git a/src/render/jobs/updateskinningpalettejob.cpp b/src/render/jobs/updateskinningpalettejob.cpp
index 1277cee79..51a3bb030 100644
--- a/src/render/jobs/updateskinningpalettejob.cpp
+++ b/src/render/jobs/updateskinningpalettejob.cpp
@@ -95,7 +95,7 @@ void UpdateSkinningPaletteJob::run()
         auto skeleton = skeletonManager->lookupResource(skeletonId);
         Q_ASSERT(skeleton);
 
-        const QList<QMatrix4x4> skinningPalette = skeleton->calculateSkinningMatrixPalette();
+        const QVector<QMatrix4x4> &skinningPalette = skeleton->calculateSkinningMatrixPalette();
         armature->skinningPaletteUniform().setData(skinningPalette);
     }
 }