diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 14:02:36 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 19:32:07 +0200 |
commit | 8a59b2ebf081af5bb9698281420d0ce59405712d (patch) | |
tree | 354f5ca9f897667c8ee9b0765c32a1f2daabcd92 /src/plugins/sceneparsers/gltfexport/gltfexporter.h | |
parent | 858e0ce0ef39e3094e09c19fa27a896be4abfe74 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Ic726ce85e01190dbc64426388fd454c54ae3c3e3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.h')
-rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h index e135ea8eb..dfa180ee4 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h @@ -118,7 +118,7 @@ private: uint componentType; uint target; }; - QVector<BufferView> views; + QList<BufferView> views; struct Accessor { Accessor() : offset(0), stride(0), count(0), componentType(0) { } QString name; @@ -130,7 +130,7 @@ private: uint componentType; QString type; }; - QVector<Accessor> accessors; + QList<Accessor> accessors; QString name; // generated QString originalName; // may be empty QString materialName; @@ -161,8 +161,8 @@ private: QHash<QString, QColor> colors; QHash<QString, QString> textures; QHash<QString, QVariant> values; - QVector<int> blendArguments; - QVector<int> blendEquations; + QList<int> blendArguments; + QList<int> blendEquations; }; struct ProgramInfo { @@ -214,7 +214,7 @@ private: struct Node { QString name; QString uniqueName; // generated - QVector<Node *> children; + QList<Node *> children; }; void cacheDefaultProperties(PropertyCacheType type); @@ -293,14 +293,14 @@ private: QHash<Qt3DRender::QEffect *, QString> m_effectIdMap; QHash<Qt3DRender::QTechnique *, QString> m_techniqueIdMap; QHash<PropertyCacheType, QObject *> m_defaultObjectCache; - QHash<PropertyCacheType, QVector<QMetaProperty> > m_propertyCache; + QHash<PropertyCacheType, QList<QMetaProperty>> m_propertyCache; QHash<Qt3DRender::QGeometryRenderer *, MeshInfo> m_meshInfo; QHash<Qt3DRender::QMaterial *, MaterialInfo> m_materialInfo; QHash<Qt3DRender::QCameraLens *, CameraInfo> m_cameraInfo; QHash<Qt3DRender::QAbstractLight *, LightInfo> m_lightInfo; QHash<Qt3DRender::QShaderProgram *, ProgramInfo> m_programInfo; - QVector<ShaderInfo> m_shaderInfo; + QList<ShaderInfo> m_shaderInfo; Node *m_rootNode; bool m_rootNodeEmpty; |