diff options
| author | Janne Koskinen <janne.p.koskinen@theqtcompany.com> | 2016-03-01 17:49:42 +0200 |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@theqtcompany.com> | 2016-03-02 08:06:40 +0000 |
| commit | 4ac71834313da3f5942a56282d4d337aef5a81f3 (patch) | |
| tree | 67797cf21187742d75fa10485d112facb8ae9bf5 /tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp | |
| parent | 1c4cd066aaa4d51d468aa22d139b08ad8a81e484 (diff) | |
Renaming QTechniqueFilter API
As per API review.
Change-Id: Ib3565b6cce74803fcf4920f125c3444e4b44444e
Task-number: QTBUG-51512
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp')
| -rw-r--r-- | tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index a30258c97..24a5ba781 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -83,8 +83,8 @@ private Q_SLOTS: annotation1->setName(QStringLiteral("hasNitroKit")); annotation1->setValue(false); QList<Qt3DRender::QAnnotation *> annotations1 = QList<Qt3DRender::QAnnotation *>() << annotation1 << annotation2; - techniqueFilterWithAnnotations->addRequirement(annotation1); - techniqueFilterWithAnnotations->addRequirement(annotation2); + techniqueFilterWithAnnotations->addMatch(annotation1); + techniqueFilterWithAnnotations->addMatch(annotation2); QTest::newRow("techniqueFilterWithAnnotations") << techniqueFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << annotations1; Qt3DRender::QTechniqueFilter *techniqueFilterWithParamsAndAnnotations = new Qt3DRender::QTechniqueFilter(); @@ -100,8 +100,8 @@ private Q_SLOTS: QList<Qt3DRender::QAnnotation *> annotations2 = QList<Qt3DRender::QAnnotation *>() << annotation3 << annotation4; techniqueFilterWithParamsAndAnnotations->addParameter(parameter3); techniqueFilterWithParamsAndAnnotations->addParameter(parameter4); - techniqueFilterWithParamsAndAnnotations->addRequirement(annotation3); - techniqueFilterWithParamsAndAnnotations->addRequirement(annotation4); + techniqueFilterWithParamsAndAnnotations->addMatch(annotation3); + techniqueFilterWithParamsAndAnnotations->addMatch(annotation4); QTest::newRow("techniqueFilterWithParamsAndAnnotations") << techniqueFilterWithParamsAndAnnotations << params2 << annotations2; } @@ -194,7 +194,7 @@ private Q_SLOTS: // WHEN Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - techniqueFilter->addRequirement(annotation1); + techniqueFilter->addMatch(annotation1); QCoreApplication::processEvents(); // THEN @@ -208,14 +208,14 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - techniqueFilter->addRequirement(annotation1); + techniqueFilter->addMatch(annotation1); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - techniqueFilter->removeRequirement(annotation1); + techniqueFilter->removeMatch(annotation1); QCoreApplication::processEvents(); // THEN |