summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
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/quick3d/quick3drender/items
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/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetselector.cpp2
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index 1ace5950a..ce9ebd976 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
@@ -70,7 +70,7 @@ void Quick3DRenderTargetSelector::setDrawBuffers(const QVariantList &buffers)
if (buffers != drawBuffers()) {
// Converts int to RenderAttachmentType
- QVector<QRenderTargetOutput::AttachmentPoint> drawBuffersList;
+ QList<QRenderTargetOutput::AttachmentPoint> drawBuffersList;
drawBuffersList.reserve(buffers.size());
for (const QVariant &buf : buffers)
drawBuffersList.append(static_cast<QRenderTargetOutput::AttachmentPoint>(buf.toInt()));
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 9dac7bbc6..36681b021 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -53,7 +53,7 @@ public:
: QNodePrivate()
{}
- QVector<QShaderData *> m_values;
+ QList<QShaderData *> m_values;
};
Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent)
@@ -70,7 +70,7 @@ QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList()
&Quick3DShaderDataArray::clearValues);
}
-QVector<QShaderData *> Quick3DShaderDataArray::values() const
+QList<QShaderData *> Quick3DShaderDataArray::values() const
{
Q_D(const Quick3DShaderDataArray);
return d->m_values;
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index 86d11d13c..a7c7ae833 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -78,7 +78,7 @@ class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DC
public:
explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0);
QQmlListProperty<QShaderData> valuesList();
- QVector<QShaderData *> values() const;
+ QList<QShaderData *> values() const;
private:
static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar);