Remove QAbstractAspect::onRootEntityChanged

No longer needed, as we can do all needed in onEngineStartup().

Task-number: QTBUG-51421
Change-Id: I64487b9f118aaad073e4e060bc5fd36f3a6dd16a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 3 insertions, 11 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 09d418509..edef2c19b 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -198,10 +198,9 @@ void QAbstractAspectPrivate::clearBackendNode(QNode *frontend) const
     }
 }
 
-void QAbstractAspectPrivate::registerAspect(QEntity *rootObject)
+void QAbstractAspectPrivate::setRootAndCreateNodes(QEntity *rootObject)
 {
     qCDebug(Aspects) << Q_FUNC_INFO << "rootObject =" << rootObject;
-    Q_Q(QAbstractAspect);
     if (rootObject == m_root)
         return;
 
@@ -210,7 +209,6 @@ void QAbstractAspectPrivate::registerAspect(QEntity *rootObject)
 
     QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QAbstractAspectPrivate::createBackendNode);
-    q->onRootEntityChanged(rootObject);
 }
 
 QServiceLocator *QAbstractAspectPrivate::services() const
@@ -269,10 +267,6 @@ void QAbstractAspect::onEngineShutdown()
 {
 }
 
-void QAbstractAspect::onRootEntityChanged(QEntity *rootEntity)
-{
-    Q_UNUSED(rootEntity);
-}
 
 } // of namespace Qt3DCore
 
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index e4f8b8453..079c1bbd8 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -89,8 +89,6 @@ private:
     virtual void onEngineStartup();
     virtual void onEngineShutdown();
 
-    virtual void onRootEntityChanged(QEntity *rootEntity);
-
     Q_DECLARE_PRIVATE(QAbstractAspect)
     friend class QAspectEngine;
     friend class QAspectManager;
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index bf7b035c3..5ce480288 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -80,7 +80,7 @@ class QT3DCORE_PRIVATE_EXPORT QAbstractAspectPrivate
 public:
     QAbstractAspectPrivate();
 
-    void registerAspect(QEntity *rootObject);
+    void setRootAndCreateNodes(QEntity *rootObject);
 
     QServiceLocator *services() const;
     QAbstractAspectJobManager *jobManager() const;
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 7ea94e63d..aacf753e4 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -154,7 +154,7 @@ void QAspectManager::setRootEntity(Qt3DCore::QEntity *root)
 
     if (m_root) {
         for (QAbstractAspect *aspect : qAsConst(m_aspects))
-            aspect->d_func()->registerAspect(m_root);
+            aspect->d_func()->setRootAndCreateNodes(m_root);
     }
 }