Rename QAbstractAspect::onInitialized() to onRegistered()

This is the first step in reworking the startup/shutdown code to
simplify it and provide a more symmetric API.

Task-number: QTBUG-51421
Change-Id: Ib06be1e7adb3f3d52b31d5e0a1ec598f39543f9a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 11 insertions, 4 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 625741683..9a3ff262b 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -133,7 +133,13 @@ QVector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time)
     return QVector<QAspectJobPtr>();
 }
 
-void QAbstractAspect::onInitialize()
+/*!
+    Called in the context of the aspect thread once the aspect has been registered.
+    This provides an opportunity for the aspect to do any initialization tasks that
+    require to be in the aspect thread context such as creating QObject subclasses that
+    must have affinity with this thread.
+*/
+void QAbstractAspect::onRegistered()
 {
 }
 
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index c26df838f..e97287087 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -78,7 +78,7 @@ private:
 
     virtual QVector<QAspectJobPtr> jobsToExecute(qint64 time);
 
-    virtual void onInitialize();
+    virtual void onRegistered();
     virtual void onCleanup();
 
     virtual void onStartup();
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 64cb33f11..a7a6c2b41 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -149,8 +149,9 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect)
         QAbstractAspectPrivate::get(aspect)->m_arbiter = m_changeArbiter;
         // Register sceneObserver with the QChangeArbiter
         m_changeArbiter->registerSceneObserver(aspect->d_func());
-        // Initialize the aspect in the main thread
-        aspect->onInitialize();
+
+        // Allow the aspect to do some work now that it is registered
+        aspect->onRegistered();
     }
     else {
         qCWarning(Aspects) << "Failed to register aspect";