summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-04-18 15:58:36 +0100
committerRobert Brock <robert.brock@kdab.com>2016-04-20 09:03:47 +0000
commitb53bfd3bdd1241d2465f0da9e495b509ec11dd39 (patch)
treec2cb225336e7c81c712fc96501bac93d1dd82afd
parenta01479994e17319c9db2a4ce4a2bf7fe02dc7a4a (diff)
QVectorize PointLightBlock
Replaced QList with QVector Change-Id: Iea1d5b1d755f79d9f26a3e0c8c0d3d46b0a5dd32 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp2
-rw-r--r--examples/qt3d/deferred-renderer-cpp/pointlightblock.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index 4c337f6f3..ca00a5108 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
@@ -60,7 +60,7 @@ PointLightBlock::~PointLightBlock()
{
}
-QList<Qt3DRender::QShaderData *> PointLightBlock::lights() const
+QVector<Qt3DRender::QShaderData *> PointLightBlock::lights() const
{
return m_lights;
}
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 8cd0b29bf..f2c664fad 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -56,19 +56,19 @@
class PointLightBlock : public Qt3DRender::QShaderData
{
Q_OBJECT
- Q_PROPERTY(QList<QShaderData *> lights READ lights NOTIFY lightsChanged)
+ Q_PROPERTY(QVector<QShaderData *> lights READ lights NOTIFY lightsChanged)
public:
explicit PointLightBlock(Qt3DCore::QNode *parent = 0);
~PointLightBlock();
- QList<Qt3DRender::QShaderData *> lights() const;
+ QVector<Qt3DRender::QShaderData *> lights() const;
void addLight(Qt3DRender::QShaderData *light);
Q_SIGNALS:
void lightsChanged();
private:
- QList<Qt3DRender::QShaderData *> m_lights;
+ QVector<Qt3DRender::QShaderData *> m_lights;
};
#endif // POINTLIGHTBLOCK_H