Remove deprecated classes and functions

Mostly old messaging API

Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 23 insertions, 106 deletions

diff --git a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
index 81f949064..479fffa29 100644
--- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
+++ b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
@@ -36,11 +36,7 @@
 #include <Qt3DRender/private/qrenderpass_p.h>
 #include <QObject>
 #include <QSignalSpy>
-#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
-#include <Qt3DCore/qnodecreatedchange.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_QRenderPass : public QObject
 {
@@ -151,77 +147,6 @@ private Q_SLOTS:
         }
     }
 
-    void checkCreationData()
-    {
-        // GIVEN
-        Qt3DRender::QRenderPass renderPass;
-
-        Qt3DRender::QShaderProgram shader;
-        renderPass.setShaderProgram(&shader);
-        Qt3DRender::QFilterKey filterKey;
-        renderPass.addFilterKey(&filterKey);
-        Qt3DRender::QDepthTest renderState;
-        renderPass.addRenderState(&renderState);
-        Qt3DRender::QParameter parameter;
-        renderPass.addParameter(&parameter);
-
-        // WHEN
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&renderPass);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 5); // RenderPass + Shader + FilterKey + Parameter + State
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QRenderPassData>>(creationChanges.first());
-            const Qt3DRender::QRenderPassData cloneData = creationChangeData->data;
-
-            QCOMPARE(renderPass.shaderProgram()->id(), cloneData.shaderId);
-            QCOMPARE(cloneData.filterKeyIds.size(), 1);
-            QCOMPARE(filterKey.id(), cloneData.filterKeyIds.first());
-            QCOMPARE(cloneData.renderStateIds.size(), 1);
-            QCOMPARE(renderState.id(), cloneData.renderStateIds.first());
-            QCOMPARE(cloneData.parameterIds.size(), 1);
-            QCOMPARE(parameter.id(), cloneData.parameterIds.first());
-            QCOMPARE(renderPass.id(), creationChangeData->subjectId());
-            QCOMPARE(renderPass.isEnabled(), true);
-            QCOMPARE(renderPass.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(renderPass.metaObject(), creationChangeData->metaObject());
-        }
-
-        // WHEN
-        renderPass.setEnabled(false);
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&renderPass);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 5); // RenderPass + Shader + FilterKey + Parameter + State
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QRenderPassData>>(creationChanges.first());
-            const Qt3DRender::QRenderPassData cloneData = creationChangeData->data;
-
-            QCOMPARE(renderPass.shaderProgram()->id(), cloneData.shaderId);
-            QCOMPARE(cloneData.filterKeyIds.size(), 1);
-            QCOMPARE(filterKey.id(), cloneData.filterKeyIds.first());
-            QCOMPARE(cloneData.renderStateIds.size(), 1);
-            QCOMPARE(renderState.id(), cloneData.renderStateIds.first());
-            QCOMPARE(cloneData.parameterIds.size(), 1);
-            QCOMPARE(parameter.id(), cloneData.parameterIds.first());
-            QCOMPARE(renderPass.id(), creationChangeData->subjectId());
-            QCOMPARE(renderPass.isEnabled(), false);
-            QCOMPARE(renderPass.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(renderPass.metaObject(), creationChangeData->metaObject());
-        }
-    }
-
     void checkShaderProgramBookkeeping()
     {
         // GIVEN
@@ -304,11 +229,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.dirtyNodes.clear();
+            arbiter.clear();
         }
 
         {
@@ -317,8 +241,7 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 0);
+            QCOMPARE(arbiter.dirtyNodes().size(), 0);
         }
 
     }
@@ -337,11 +260,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
         {
@@ -350,11 +272,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
     }
@@ -373,11 +294,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
         {
@@ -386,11 +306,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
     }
@@ -409,11 +328,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
         {
@@ -422,11 +340,10 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(arbiter.events.size(), 0);
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &renderPass);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &renderPass);
 
-            arbiter.events.clear();
+            arbiter.clear();
         }
 
     }