diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 14:01:04 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:54 +0000 |
commit | b6ee562da9314fe2d737284ddef67567f1682619 (patch) | |
tree | f8aae4c1e0e2c4062201c97a0b9619a798916374 /tests/auto/render | |
parent | bd9391529798c19f3e933ac6ecf468064cfe3346 (diff) |
Rename QNodeRemovedPropertyChange -> QPropertyNodeRemovedChange
Task-number: QTBUG-51494
Change-Id: I1c7f1c680bc18c6201b790e96dc4023564837122
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render')
12 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 03ffb2ac0..6a8746f47 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -33,7 +33,7 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include "testrenderer.h" class DummyAttribute : public Qt3DRender::QAttribute @@ -136,7 +136,7 @@ private Q_SLOTS: QVERIFY(!renderGeometry.isDirty()); // WHEN - const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &attribute); + const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &attribute); nodeRemovedChange->setPropertyName("attribute"); renderGeometry.sceneChangeEvent(nodeRemovedChange); diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 6bda37396..4df822557 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -34,7 +34,7 @@ #include <Qt3DRender/qgeometryfactory.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include "testrenderer.h" class TestFactory : public Qt3DRender::QGeometryFactory @@ -303,7 +303,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &geometry); + const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &geometry); nodeRemovedChange->setPropertyName("geometry"); renderGeometryRenderer.sceneChangeEvent(nodeRemovedChange); diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index d2ff45fea..561ac66eb 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -35,7 +35,7 @@ #include <Qt3DRender/QEffect> #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include "testrenderer.h" using namespace Qt3DCore; @@ -148,7 +148,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter.data()); + const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), parameter.data()); removeChange->setPropertyName("parameter"); backend.sceneChangeEvent(removeChange); diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index a54f7322a..8e0974657 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include "testpostmanarbiter.h" @@ -138,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "attribute"); QCOMPARE(nodeRemovedChange->removedNodeId(), attr.id()); QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 14dbf5d59..11835be2d 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -40,7 +40,7 @@ #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include "testpostmanarbiter.h" @@ -292,7 +292,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 2); - Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "geometry"); QCOMPARE(nodeRemovedChange->removedNodeId(), geom.id()); QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index fb4a24569..60ea33f71 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp @@ -31,7 +31,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/qlayer.h> #include <Qt3DRender/qlayerfilter.h> @@ -154,7 +154,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - auto removeChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + auto removeChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(removeChange->propertyName(), "layer"); QCOMPARE(removeChange->subjectId(), layerFilter->id()); QCOMPARE(removeChange->removedNodeId(), layer->id()); diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 4304611b7..437cfa5ad 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DRender/private/qrenderstate_p.h> diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index d4b5a0667..9e6e4fcc1 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include "testpostmanarbiter.h" @@ -175,7 +175,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "parameter"); QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id()); @@ -211,7 +211,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "match"); QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id()); diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp index 7fdd90720..073306237 100644 --- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp +++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include "testpostmanarbiter.h" @@ -161,7 +161,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "renderState"); QCOMPARE(nodeRemovedChange->subjectId(), stateSet->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), state1->id()); diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp index 375e670f8..cee977790 100644 --- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp +++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp @@ -31,7 +31,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qnoderemovedpropertychange.h> +#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> #include <Qt3DRender/qsortpolicy.h> @@ -134,7 +134,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QNodeRemovedPropertyChangePtr removeChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr removeChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(removeChange->propertyName(), "sortType"); QCOMPARE(removeChange->subjectId(), sortPolicy->id()); QCOMPARE(removeChange->removedValue().value<Qt3DRender::QSortPolicy::SortType>(), sortType1); diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 109b48f19..8438cf033 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include "testpostmanarbiter.h" @@ -180,7 +180,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "parameter"); QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id()); @@ -216,7 +216,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); + nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "matchAll"); QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id()); diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index edf4483ee..42233f574 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -32,7 +32,7 @@ #include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DCore/QPropertyNodeAddedChange> -#include <Qt3DCore/QNodeRemovedPropertyChange> +#include <Qt3DCore/QPropertyNodeRemovedChange> #include <Qt3DRender/QFilterKey> #include <Qt3DRender/QRenderPass> @@ -145,7 +145,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), shader.data()); + const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), shader.data()); removeChange->setPropertyName("shaderProgram"); backend.sceneChangeEvent(removeChange); @@ -173,7 +173,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), annotation.data()); + const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), annotation.data()); removeChange->setPropertyName("filterKeys"); backend.sceneChangeEvent(removeChange); @@ -201,7 +201,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter.data()); + const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), parameter.data()); removeChange->setPropertyName("parameter"); backend.sceneChangeEvent(removeChange); @@ -232,7 +232,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), frontendState); + const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), frontendState); removeChange->setPropertyName("renderState"); backend.sceneChangeEvent(removeChange); |