summaryrefslogtreecommitdiffstats
path: root/src/core/transforms
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-08 15:56:06 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-09 12:23:57 +0200
commit39d0041f15601cee499c959702b004cbd721bed9 (patch)
tree95140b88dee61bd78d171cb958ceca0cca978ad1 /src/core/transforms
parent93bd28e6d4ac8fdb6b07b30684e6b17ee515e44e (diff)
Use QList instead of QVector in implementation and docs
Fix some const correctness. Use list-initialization. Task-number: QTBUG-84469 Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/transforms')
-rw-r--r--src/core/transforms/qabstractskeleton_p.h4
-rw-r--r--src/core/transforms/qjoint_p.h2
-rw-r--r--src/core/transforms/sqt_p.h8
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/transforms/qabstractskeleton_p.h b/src/core/transforms/qabstractskeleton_p.h
index 333fa5fdf..01d8fc74e 100644
--- a/src/core/transforms/qabstractskeleton_p.h
+++ b/src/core/transforms/qabstractskeleton_p.h
@@ -78,8 +78,8 @@ public:
SkeletonType m_type;
int m_jointCount;
- QVector<Sqt> m_localPoses;
- QVector<QString> m_jointNames;
+ QList<Sqt> m_localPoses;
+ QList<QString> m_jointNames;
};
} // namespace Qt3DCore
diff --git a/src/core/transforms/qjoint_p.h b/src/core/transforms/qjoint_p.h
index cb0bfe847..60faac726 100644
--- a/src/core/transforms/qjoint_p.h
+++ b/src/core/transforms/qjoint_p.h
@@ -68,7 +68,7 @@ public:
Q_DECLARE_PUBLIC(QJoint)
QMatrix4x4 m_inverseBindMatrix;
- QVector<QJoint *> m_childJoints;
+ QList<QJoint *> m_childJoints;
QQuaternion m_rotation;
QVector3D m_translation;
QVector3D m_scale;
diff --git a/src/core/transforms/sqt_p.h b/src/core/transforms/sqt_p.h
index e602cc71e..a3aadd01d 100644
--- a/src/core/transforms/sqt_p.h
+++ b/src/core/transforms/sqt_p.h
@@ -54,7 +54,7 @@
#include <QtGui/qmatrix4x4.h>
#include <QtGui/qquaternion.h>
#include <QtGui/qvector3d.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@@ -95,15 +95,15 @@ struct Sqt
struct JointNamesAndLocalPoses
{
- QVector<QString> names;
- QVector<Sqt> localPoses;
+ QList<QString> names;
+ QList<Sqt> localPoses;
};
} // namespace Qt3DCore
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(QVector<Qt3DCore::Sqt>)
+Q_DECLARE_METATYPE(QList<Qt3DCore::Sqt>)
Q_DECLARE_METATYPE(Qt3DCore::JointNamesAndLocalPoses)
#endif // QT3DCORE_SQT_P_H