summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-04-15 13:59:46 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-04-16 07:38:29 +0000
commit8cc3dc8a1751c6e6ef45b313d01102baa5c64dac (patch)
treeacdce480bc25dbd3a5eaf91019c49b20d267d94f /tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
parent10f24b782f3856e5f5ddfc6710ab4b94facbddb5 (diff)
QVectorize QRenderPassFilter
Change-Id: If24f61eaae6e4fd1f7ce89df260e44efa2f48f63 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp')
-rw-r--r--tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
index 7b89e99ad..feda852d4 100644
--- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
+++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
@@ -61,19 +61,19 @@ private Q_SLOTS:
void checkCloning_data()
{
QTest::addColumn<Qt3DRender::QRenderPassFilter *>("renderPassFilter");
- QTest::addColumn<QList<Qt3DRender::QParameter *> >("parameters");
- QTest::addColumn<QList<Qt3DRender::QFilterKey *> >("filterKeys");
+ QTest::addColumn<QVector<Qt3DRender::QParameter *> >("parameters");
+ QTest::addColumn<QVector<Qt3DRender::QFilterKey *> >("filterKeys");
Qt3DRender::QRenderPassFilter *defaultConstructed = new Qt3DRender::QRenderPassFilter();
- QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QParameter *>() << QList<Qt3DRender::QFilterKey *>();
+ QTest::newRow("defaultConstructed") << defaultConstructed << QVector<Qt3DRender::QParameter *>() << QVector<Qt3DRender::QFilterKey *>();
Qt3DRender::QRenderPassFilter *renderPassFilterWithParams = new Qt3DRender::QRenderPassFilter();
Qt3DRender::QParameter *parameter1 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 454.0f);
Qt3DRender::QParameter *parameter2 = new Qt3DRender::QParameter(QStringLiteral("torque"), 650);
- QList<Qt3DRender::QParameter *> params1 = QList<Qt3DRender::QParameter *>() << parameter1 << parameter2;
+ QVector<Qt3DRender::QParameter *> params1 = QVector<Qt3DRender::QParameter *>() << parameter1 << parameter2;
renderPassFilterWithParams->addParameter(parameter1);
renderPassFilterWithParams->addParameter(parameter2);
- QTest::newRow("renderPassFilterWithParams") << renderPassFilterWithParams << params1 << QList<Qt3DRender::QFilterKey *>();
+ QTest::newRow("renderPassFilterWithParams") << renderPassFilterWithParams << params1 << QVector<Qt3DRender::QFilterKey *>();
Qt3DRender::QRenderPassFilter *renderPassFilterWithAnnotations = new Qt3DRender::QRenderPassFilter();
Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey();
@@ -82,10 +82,10 @@ private Q_SLOTS:
filterKey1->setValue(true);
filterKey1->setName(QStringLiteral("hasNitroKit"));
filterKey1->setValue(false);
- QList<Qt3DRender::QFilterKey *> filterKeys1 = QList<Qt3DRender::QFilterKey *>() << filterKey1 << filterKey2;
+ QVector<Qt3DRender::QFilterKey *> filterKeys1 = QVector<Qt3DRender::QFilterKey *>() << filterKey1 << filterKey2;
renderPassFilterWithAnnotations->addMatch(filterKey1);
renderPassFilterWithAnnotations->addMatch(filterKey2);
- QTest::newRow("renderPassFilterWithAnnotations") << renderPassFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << filterKeys1;
+ QTest::newRow("renderPassFilterWithAnnotations") << renderPassFilterWithAnnotations << QVector<Qt3DRender::QParameter *>() << filterKeys1;
Qt3DRender::QRenderPassFilter *renderPassFilterWithParamsAndAnnotations = new Qt3DRender::QRenderPassFilter();
Qt3DRender::QParameter *parameter3 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 383.0f);
@@ -96,8 +96,8 @@ private Q_SLOTS:
filterKey3->setValue(false);
filterKey4->setName(QStringLiteral("hasNitroKit"));
filterKey4->setValue(true);
- QList<Qt3DRender::QParameter *> params2 = QList<Qt3DRender::QParameter *>() << parameter3 << parameter4;
- QList<Qt3DRender::QFilterKey *> filterKeys2 = QList<Qt3DRender::QFilterKey *>() << filterKey3 << filterKey4;
+ QVector<Qt3DRender::QParameter *> params2 = QVector<Qt3DRender::QParameter *>() << parameter3 << parameter4;
+ QVector<Qt3DRender::QFilterKey *> filterKeys2 = QVector<Qt3DRender::QFilterKey *>() << filterKey3 << filterKey4;
renderPassFilterWithParamsAndAnnotations->addParameter(parameter3);
renderPassFilterWithParamsAndAnnotations->addParameter(parameter4);
renderPassFilterWithParamsAndAnnotations->addMatch(filterKey3);
@@ -109,8 +109,8 @@ private Q_SLOTS:
{
// GIVEN
QFETCH(Qt3DRender::QRenderPassFilter*, renderPassFilter);
- QFETCH(QList<Qt3DRender::QParameter *>, parameters);
- QFETCH(QList<Qt3DRender::QFilterKey *>, filterKeys);
+ QFETCH(QVector<Qt3DRender::QParameter *>, parameters);
+ QFETCH(QVector<Qt3DRender::QFilterKey *>, filterKeys);
// THEN
QCOMPARE(renderPassFilter->parameters(), parameters);