Remove deprecated classes and functions

Mostly old messaging API

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

1 files changed, 11 insertions, 56 deletions

diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
index 650e531c2..9b70887fe 100644
--- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
+++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
@@ -29,13 +29,11 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DRender/qcameraselector.h>
 #include <Qt3DRender/private/qcameraselector_p.h>
 #include <Qt3DCore/qentity.h>
-
-#include "testpostmanarbiter.h"
+#include <testarbiter.h>
 
 class tst_QCameraSelector: public QObject
 {
@@ -43,45 +41,6 @@ class tst_QCameraSelector: public QObject
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DRender::QCameraSelector *>("cameraSelector");
-        QTest::addColumn<Qt3DCore::QEntity *>("camera");
-
-        Qt3DRender::QCameraSelector *defaultConstructed = new Qt3DRender::QCameraSelector();
-        QTest::newRow("defaultConstructed") << defaultConstructed << static_cast<Qt3DCore::QEntity *>(nullptr);
-
-        Qt3DRender::QCameraSelector *selector1 = new Qt3DRender::QCameraSelector();
-        Qt3DCore::QEntity *camera1 = new Qt3DCore::QEntity();
-        QTest::newRow("valid camera") << selector1 << camera1;
-        selector1->setCamera(camera1);
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DRender::QCameraSelector *, cameraSelector);
-        QFETCH(Qt3DCore::QEntity *, camera);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(cameraSelector);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + (camera ? 1 : 0));
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DRender::QCameraSelectorData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QCameraSelectorData>>(creationChanges.first());
-        const Qt3DRender::QCameraSelectorData &cloneData = creationChangeData->data;
-
-        QCOMPARE(cameraSelector->id(), creationChangeData->subjectId());
-        QCOMPARE(cameraSelector->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(cameraSelector->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(cameraSelector->camera() ? cameraSelector->camera()->id() : Qt3DCore::QNodeId(), cloneData.cameraId);
-
-        delete cameraSelector;
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -94,39 +53,35 @@ private Q_SLOTS:
         cameraSelector->setCamera(camera);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), cameraSelector.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), cameraSelector.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         cameraSelector->setCamera(camera);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes().size(), 0);
 
         // WHEN
         Qt3DCore::QEntity *camera2 = new Qt3DCore::QEntity();
         cameraSelector->setCamera(camera2);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), cameraSelector.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), cameraSelector.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         cameraSelector->setCamera(nullptr);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), cameraSelector.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), cameraSelector.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkCameraBookkeeping()