diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-04-19 13:58:19 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-21 17:27:49 +0000 |
commit | c8b021896accbf8fea4779a3812bbddae09e881f (patch) | |
tree | def43ff76545447625245e9a401d669287af8830 /src | |
parent | c7d01511eb30da1ae3935312d9dece72fddc34f4 (diff) |
QVectorize Quick3DShaderDataArray
Change-Id: I68f7ce1995534a6775d26ecaa936c47f3a18e35a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index a9529c189..62111535c 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -161,7 +161,7 @@ static const struct { QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Quick::Quick3DShaderDataArray *array) { - QList<Qt3DRender::QShaderData *> arrayValues = array->values(); + QVector<Qt3DRender::QShaderData *> arrayValues = array->values(); QVariantList values; values.reserve(arrayValues.size()); Q_FOREACH (Qt3DRender::QShaderData *data, arrayValues) 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; |