Factor out in QAbstractAspect common behavior

There was code involving the node visitor duplicated in several aspect,
move that logic back into their common base class: QAbstractAspect.

Change-Id: I47320e93691edb43e3cccdd81753423816ad955d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 0 insertions, 35 deletions

diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index d07a5b366..220484d4d 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -42,8 +42,6 @@
 #include "keyboardinput_p.h"
 #include "mousecontroller_p.h"
 #include "mouseinput_p.h"
-#include <Qt3DCore/qnodevisitor.h>
-#include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DInput/qkeyboardcontroller.h>
 #include <Qt3DInput/qkeyboardinput.h>
 #include <Qt3DInput/qmousecontroller.h>
@@ -185,29 +183,6 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QInputAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
-{
-    QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
-    QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
-    QNode *n = nodePtr.data();
-    QNodeVisitor visitor;
-    visitor.traverse(n, this, &QInputAspect::visitNode);
-}
-
-void QInputAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
-{
-    QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
-    QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
-    QNode *n = nodePtr.data();
-    QAbstractAspect::clearBackendNode(n);
-}
-
-void QInputAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
-{
-    QNodeVisitor visitor;
-    visitor.traverse(rootObject, this, &QInputAspect::visitNode);
-}
-
 void QInputAspect::onInitialize(const QVariantMap &)
 {
     Q_D(QInputAspect);
@@ -232,11 +207,6 @@ void QInputAspect::onCleanup()
     d->m_inputHandler.reset(Q_NULLPTR);
 }
 
-void QInputAspect::visitNode(Qt3DCore::QNode *node)
-{
-    QAbstractAspect::createBackendNode(node);
-}
-
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h
index 78054e08d..9d0292c46 100644
--- a/src/input/frontend/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
@@ -63,20 +63,15 @@ public:
 
     QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-
 public Q_SLOTS:
     void setCamera(Qt3DCore::QCamera *camera);
 
 private:
-    void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE;
     void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
     void onStartup() Q_DECL_OVERRIDE;
     void onShutdown() Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;
 
-    void visitNode(Qt3DCore::QNode *node);
     void loadInputDevicePlugins();
 
     Q_DECLARE_PRIVATE(QInputAspect)