diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-23 17:33:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-27 11:19:18 +0000 |
| commit | 5157512a7e83cb1b98c68f12f9b164433eddd644 (patch) | |
| tree | 57ddaa5e0955172f3c923750baa25b687d976808 /tests/auto/render/geometry | |
| parent | 9ef21c30528f25d2128d7a0357d450ec2f65425a (diff) | |
QGeometry use new added/removed change types
Change-Id: I2af76675187f9dc16aa466a95f5e6fb0d0b03a09
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/geometry')
| -rw-r--r-- | tests/auto/render/geometry/tst_geometry.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index c1536b6c0..5188fc83b 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -31,6 +31,8 @@ #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qnodeaddedpropertychange.h> +#include <Qt3DCore/qnoderemovedpropertychange.h> #include "testrenderer.h" class tst_RenderGeometry : public QObject @@ -111,10 +113,9 @@ private Q_SLOTS: Qt3DCore::QNodeId geometryId = Qt3DCore::QNodeId::createId(); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setValue(QVariant::fromValue(geometryId)); - updateChange->setPropertyName("attribute"); - renderGeometry.sceneChangeEvent(updateChange); + const auto nodeAddedChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), geometryId); + nodeAddedChange->setPropertyName("attribute"); + renderGeometry.sceneChangeEvent(nodeAddedChange); // THEN QCOMPARE(renderGeometry.attributes().count(), 1); @@ -124,10 +125,9 @@ private Q_SLOTS: QVERIFY(!renderGeometry.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setValue(QVariant::fromValue(geometryId)); - updateChange->setPropertyName("attribute"); - renderGeometry.sceneChangeEvent(updateChange); + const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), geometryId); + nodeRemovedChange->setPropertyName("attribute"); + renderGeometry.sceneChangeEvent(nodeRemovedChange); // THEN QCOMPARE(renderGeometry.attributes().count(), 0); @@ -138,7 +138,7 @@ private Q_SLOTS: // WHEN const Qt3DCore::QNodeId boundingAttrId = Qt3DCore::QNodeId::createId(); - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(boundingAttrId)); updateChange->setPropertyName("boundingVolumePositionAttribute"); renderGeometry.sceneChangeEvent(updateChange); |