Remove QAbstractAspect::onCleanup()

This was actually called both when unsetting a root entity and during
final shutdown. Remove it and move work it was doing to the overrides
of onUnregistered() for now. Will need another look when we finish this
refactoring to also include backend node destruction.

Task-number: QTBUG-51421
Change-Id: I2f96ede4006fea3a4766d15cf6e162452dd58321
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>

3 files changed, 4 insertions, 12 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index edef2c19b..309fa3faf 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -142,10 +142,6 @@ QVector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time)
     return QVector<QAspectJobPtr>();
 }
 
-void QAbstractAspect::onCleanup()
-{
-}
-
 QBackendNode *QAbstractAspectPrivate::createBackendNode(QNode *frontend) const
 {
     const QMetaObject *metaObj = frontend->metaObject();
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 079c1bbd8..3fd33a301 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -84,8 +84,6 @@ private:
     virtual void onRegistered();
     virtual void onUnregistered();
 
-    virtual void onCleanup();
-
     virtual void onEngineStartup();
     virtual void onEngineShutdown();
 
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index aacf753e4..903d5b219 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -130,10 +130,9 @@ void QAspectManager::shutdown()
 {
     qCDebug(Aspects) << Q_FUNC_INFO;
 
-    for (QAbstractAspect *aspect : qAsConst(m_aspects)) {
-        aspect->onCleanup();
+    for (QAbstractAspect *aspect : qAsConst(m_aspects))
         m_changeArbiter->unregisterSceneObserver(aspect->d_func());
-    }
+
     // Aspects must be deleted in the Thread they were created in
 }
 
@@ -145,9 +144,8 @@ void QAspectManager::setRootEntity(Qt3DCore::QEntity *root)
         return;
 
     if (m_root) {
-        // Allow each aspect chance to cleanup any resources from this scene
-        for (QAbstractAspect *aspect : qAsConst(m_aspects))
-            aspect->onCleanup();
+        // TODO: Delete all backend nodes. This is to be symmetric with how
+        // we create them below in the call to setRootAndCreateNodes
     }
 
     m_root = root;