summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-04-19 13:58:19 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-21 17:27:49 +0000
commitc8b021896accbf8fea4779a3812bbddae09e881f (patch)
treedef43ff76545447625245e9a401d669287af8830 /src/quick3d/quick3drender/items
parentc7d01511eb30da1ae3935312d9dece72fddc34f4 (diff)
QVectorize Quick3DShaderDataArray
Change-Id: I68f7ce1995534a6775d26ecaa936c47f3a18e35a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 3a6482c5e..4ec789315 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -53,7 +53,7 @@ public:
: QNodePrivate()
{}
- QList<QShaderData *> m_values;
+ QVector<QShaderData *> m_values;
};
Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent)
@@ -75,7 +75,7 @@ QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList()
&Quick3DShaderDataArray::clearValues);
}
-QList<QShaderData *> Quick3DShaderDataArray::values() const
+QVector<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 bb8303df2..0269fd3fc 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -78,7 +78,7 @@ public:
explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0);
~Quick3DShaderDataArray();
QQmlListProperty<QShaderData> valuesList();
- QList<QShaderData *> values() const;
+ QVector<QShaderData *> values() const;
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;