Remove deprecated classes and functions

Mostly old messaging API

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

19 files changed, 30 insertions, 30 deletions

diff --git a/src/input/backend/backendnode_p.h b/src/input/backend/backendnode_p.h
index a7749852b..34fdc4362 100644
--- a/src/input/backend/backendnode_p.h
+++ b/src/input/backend/backendnode_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DInput/private/qt3dinput_global_p.h>
 #include <Qt3DCore/qbackendnode.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp
index d56a674fc..3d8c5750b 100644
--- a/src/input/backend/genericdevicebackendnode.cpp
+++ b/src/input/backend/genericdevicebackendnode.cpp
@@ -108,11 +108,11 @@ GenericDeviceBackendFunctor::GenericDeviceBackendFunctor(QInputAspect *inputaspe
 {
 }
 
-Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNodeId id) const
 {
-    GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(change->subjectId());
+    GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(id);
     backendNode->setInputAspect(m_inputAspect);
-    m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(change->subjectId()));
+    m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(id));
     return backendNode;
 }
 
diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h
index 3ae712115..36b0d8c99 100644
--- a/src/input/backend/genericdevicebackendnode_p.h
+++ b/src/input/backend/genericdevicebackendnode_p.h
@@ -89,7 +89,7 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h
index 629e599f2..1d18025f0 100644
--- a/src/input/backend/inputbackendnodefunctor_p.h
+++ b/src/input/backend/inputbackendnodefunctor_p.h
@@ -69,9 +69,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final
     {
-        Backend *backend = m_manager->getOrCreateResource(change->subjectId());
+        Backend *backend = m_manager->getOrCreateResource(id);
         return backend;
     }
 
diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp
index 4fdd61a1b..ce4aa89d9 100644
--- a/src/input/backend/inputsettings.cpp
+++ b/src/input/backend/inputsettings.cpp
@@ -71,9 +71,9 @@ InputSettingsFunctor::InputSettingsFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *InputSettingsFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNodeId id) const
 {
-    Q_UNUSED(change);
+    Q_UNUSED(id);
     if (m_handler->inputSettings() != nullptr) {
         qWarning() << "Input settings already specified";
         return nullptr;
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index 33f56cc0b..c495e18ec 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -79,7 +79,7 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit InputSettingsFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/keyboarddevice.cpp b/src/input/backend/keyboarddevice.cpp
index 0e45d1c84..0a35cefbb 100644
--- a/src/input/backend/keyboarddevice.cpp
+++ b/src/input/backend/keyboarddevice.cpp
@@ -433,12 +433,12 @@ KeyboardDeviceFunctor::KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHan
 {
 }
 
-Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(Qt3DCore::QNodeId id) const
 {
-    KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(change->subjectId());
+    KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(id);
     keyboardDevice->setInputAspect(m_inputAspect);
     keyboardDevice->setInputHandler(m_handler);
-    m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(change->subjectId()));
+    m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(id));
     return keyboardDevice;
 }
 
diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h
index 2df5eb64d..76e207889 100644
--- a/src/input/backend/keyboarddevice_p.h
+++ b/src/input/backend/keyboarddevice_p.h
@@ -265,7 +265,7 @@ class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index 026012e52..f2e365ce2 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -120,9 +120,9 @@ KeyboardHandlerFunctor::KeyboardHandlerFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *KeyboardHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *KeyboardHandlerFunctor::create(Qt3DCore::QNodeId id) const
 {
-    KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(change->subjectId());
+    KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(id);
     input->setInputHandler(m_handler);
     return input;
 }
diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h
index a5c13efbf..530361c97 100644
--- a/src/input/backend/keyboardhandler_p.h
+++ b/src/input/backend/keyboardhandler_p.h
@@ -91,7 +91,7 @@ class KeyboardHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index 17426922f..0cd6534cf 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -80,9 +80,9 @@ LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager
 {
 }
 
-Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNodeId id) const
 {
-    HLogicalDevice handle = m_manager->getOrAcquireHandle(change->subjectId());
+    HLogicalDevice handle = m_manager->getOrAcquireHandle(id);
     LogicalDevice *backend = m_manager->data(handle);
     m_manager->addActiveDevice(handle);
     return backend;
diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h
index 292f2a5c3..6e75e0e77 100644
--- a/src/input/backend/logicaldevice_p.h
+++ b/src/input/backend/logicaldevice_p.h
@@ -84,7 +84,7 @@ class LogicalDeviceNodeFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
     void destroy(Qt3DCore::QNodeId id) const final;
 
diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp
index c5b2a22ce..5c4ebf6ab 100644
--- a/src/input/backend/mousedevice.cpp
+++ b/src/input/backend/mousedevice.cpp
@@ -187,12 +187,12 @@ MouseDeviceFunctor::MouseDeviceFunctor(QInputAspect *inputAspect, InputHandler *
 {
 }
 
-Qt3DCore::QBackendNode *MouseDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *MouseDeviceFunctor::create(Qt3DCore::QNodeId id) const
 {
-    MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(change->subjectId());
+    MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(id);
     controller->setInputAspect(m_inputAspect);
     controller->setInputHandler(m_handler);
-    m_handler->appendMouseDevice(m_handler->mouseDeviceManager()->lookupHandle(change->subjectId()));
+    m_handler->appendMouseDevice(m_handler->mouseDeviceManager()->lookupHandle(id));
     return controller;
 }
 
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h
index d41bb527b..41f51ba27 100644
--- a/src/input/backend/mousedevice_p.h
+++ b/src/input/backend/mousedevice_p.h
@@ -126,7 +126,7 @@ class MouseDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseDeviceFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index 9c7ff9817..bef28912e 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -96,9 +96,9 @@ MouseHandlerFunctor::MouseHandlerFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *MouseHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *MouseHandlerFunctor::create(Qt3DCore::QNodeId id) const
 {
-    MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(change->subjectId());
+    MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(id);
     input->setInputHandler(m_handler);
     return input;
 }
diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h
index 693c42471..df6a1c12e 100644
--- a/src/input/backend/mousehandler_p.h
+++ b/src/input/backend/mousehandler_p.h
@@ -84,7 +84,7 @@ class MouseHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/physicaldeviceproxy.cpp b/src/input/backend/physicaldeviceproxy.cpp
index 390b525eb..f30233530 100644
--- a/src/input/backend/physicaldeviceproxy.cpp
+++ b/src/input/backend/physicaldeviceproxy.cpp
@@ -117,9 +117,9 @@ PhysicalDeviceProxyNodeFunctor::PhysicalDeviceProxyNodeFunctor(PhysicalDevicePro
 {
 }
 
-Qt3DCore::QBackendNode *PhysicalDeviceProxyNodeFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *PhysicalDeviceProxyNodeFunctor::create(Qt3DCore::QNodeId id) const
 {
-    HPhysicalDeviceProxy handle = m_manager->getOrAcquireHandle(change->subjectId());
+    HPhysicalDeviceProxy handle = m_manager->getOrAcquireHandle(id);
     PhysicalDeviceProxy *backend = m_manager->data(handle);
     backend->setManager(m_manager);
     return backend;
diff --git a/src/input/backend/physicaldeviceproxy_p.h b/src/input/backend/physicaldeviceproxy_p.h
index 6dd2a54be..3ec8c92e6 100644
--- a/src/input/backend/physicaldeviceproxy_p.h
+++ b/src/input/backend/physicaldeviceproxy_p.h
@@ -92,7 +92,7 @@ class PhysicalDeviceProxyNodeFunctor: public Qt3DCore::QBackendNodeMapper
 public:
     explicit PhysicalDeviceProxyNodeFunctor(PhysicalDeviceProxyManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
     void destroy(Qt3DCore::QNodeId id) const final;
 
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index 6e6899e32..18d932a21 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -43,7 +43,6 @@
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qaxissetting.h>
 #include <Qt3DInput/qinputaspect.h>
-#include <Qt3DInput/qphysicaldevicecreatedchange.h>
 
 #include <cmath>
 #include <algorithm>