From 69efa162f9ac0659814968512604afde4419aa27 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Sun, 24 Apr 2016 14:55:12 +0100
Subject: RenderPass use new added/removed change types

Again, we should be able to avoid the NodeRemoved/NodeAdded changes
for the QShaderProgram* property and rely upon the automatic handling.
Leaving this for a followup round of changes.

Change-Id: I8a9eb2b8471a47c84032191513d86b59e15a087e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 tests/auto/render/renderpass/tst_renderpass.cpp | 26 ++++++++++---------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'tests/auto/render/renderpass')

diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp
index ee91d7b58..213772857 100644
--- a/tests/auto/render/renderpass/tst_renderpass.cpp
+++ b/tests/auto/render/renderpass/tst_renderpass.cpp
@@ -30,6 +30,8 @@
 #include <Qt3DRender/private/renderpass_p.h>
 
 #include <Qt3DCore/QNodePropertyChange>
+#include <Qt3DCore/QNodeAddedPropertyChange>
+#include <Qt3DCore/QNodeRemovedPropertyChange>
 
 #include <Qt3DRender/QFilterKey>
 #include <Qt3DRender/QRenderPass>
@@ -132,8 +134,7 @@ private slots:
         backend.setRenderer(&renderer);
 
         // WHEN
-        QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, shader->id()));
-        addChange->setValue(QVariant::fromValue(shader->id()));
+        const auto addChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), shader->id());
         addChange->setPropertyName("shaderProgram");
         backend.sceneChangeEvent(addChange);
 
@@ -142,8 +143,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, shader->id()));
-        removeChange->setValue(QVariant::fromValue(shader->id()));
+        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), shader->id());
         removeChange->setPropertyName("shaderProgram");
         backend.sceneChangeEvent(removeChange);
 
@@ -161,8 +161,7 @@ private slots:
         backend.setRenderer(&renderer);
 
         // WHEN
-        QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, annotation->id()));
-        addChange->setValue(QVariant::fromValue(annotation->id()));
+        const auto addChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), annotation->id());
         addChange->setPropertyName("filterKeys");
         backend.sceneChangeEvent(addChange);
 
@@ -172,8 +171,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, annotation->id()));
-        removeChange->setValue(QVariant::fromValue(annotation->id()));
+        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), annotation->id());
         removeChange->setPropertyName("filterKeys");
         backend.sceneChangeEvent(removeChange);
 
@@ -191,8 +189,7 @@ private slots:
         backend.setRenderer(&renderer);
 
         // WHEN
-        QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, parameter->id()));
-        addChange->setValue(QVariant::fromValue(parameter->id()));
+        const auto addChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter->id());
         addChange->setPropertyName("parameter");
         backend.sceneChangeEvent(addChange);
 
@@ -202,8 +199,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id()));
-        removeChange->setValue(QVariant::fromValue(parameter->id()));
+        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter->id());
         removeChange->setPropertyName("parameter");
         backend.sceneChangeEvent(removeChange);
 
@@ -224,8 +220,7 @@ private slots:
         backendState->setPeer(frontendState);
 
         // WHEN
-        QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, frontendState->id()));
-        addChange->setValue(QVariant::fromValue(frontendStatePtr));
+        const auto addChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), frontendState->id());
         addChange->setPropertyName("renderState");
         backend.sceneChangeEvent(addChange);
 
@@ -235,8 +230,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, frontendState->id()));
-        removeChange->setValue(QVariant::fromValue(frontendState->id()));
+        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), frontendState->id());
         removeChange->setPropertyName("renderState");
         backend.sceneChangeEvent(removeChange);
 
-- 
cgit v1.2.3