Rename onStartup/onShutdown

onEngineStartup/onEngineShutdown is more descriptive of when these
functions get called in the overall flow of operation.

Task-number: QTBUG-51421
Change-Id: I09dd7dfa2e3ce961a67de7fd150bf027226849ae
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index b31c29062..f34c55308 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -246,7 +246,7 @@ void QAbstractAspect::onUnregistered()
  *
  * Called in the QAspectThread context
  */
-void QAbstractAspect::onStartup()
+void QAbstractAspect::onEngineStartup()
 {
 }
 
@@ -254,7 +254,7 @@ void QAbstractAspect::onStartup()
  *
  * Called in the QAspectThread context
  */
-void QAbstractAspect::onShutdown()
+void QAbstractAspect::onEngineShutdown()
 {
 }
 
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index b344e5c68..e4c09dca7 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -83,8 +83,8 @@ private:
 
     virtual void onCleanup();
 
-    virtual void onStartup();
-    virtual void onShutdown();
+    virtual void onEngineStartup();
+    virtual void onEngineShutdown();
 
     virtual void onRootEntityChanged(QEntity *rootEntity);
 
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index a7a6c2b41..c43d2a4bc 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -184,7 +184,7 @@ void QAspectManager::exec()
             // pieces of initialization
             qCDebug(Aspects) << "Calling onStartup() for each aspect";
             for (QAbstractAspect *aspect : qAsConst(m_aspects))
-                aspect->onStartup();
+                aspect->onEngineStartup();
         }
 
         // Only enter main render loop once the renderer and other aspects are initialized
@@ -222,7 +222,7 @@ void QAspectManager::exec()
             // any blocking work on the main thread that could potentially deadlock during shutdown.
             qCDebug(Aspects) << "Calling onShutdown() for each aspect";
             for (QAbstractAspect *aspect : qAsConst(m_aspects))
-                aspect->onShutdown();
+                aspect->onEngineShutdown();
         }
     }
     qCDebug(Aspects) << Q_FUNC_INFO << "Exiting event loop";
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index b7564434b..8a0ba47b6 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -112,13 +112,13 @@ void QLogicAspect::onCleanup()
 {
 }
 
-void QLogicAspect::onStartup()
+void QLogicAspect::onEngineStartup()
 {
     Q_D(QLogicAspect);
     d->m_executor->setScene(d->m_arbiter->scene());
 }
 
-void QLogicAspect::onShutdown()
+void QLogicAspect::onEngineShutdown()
 {
     Q_D(QLogicAspect);
     // Throw away any pending work that may deadlock during the shutdown procedure
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index 583eec3e3..1e2f05169 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -62,8 +62,8 @@ protected:
 
 private:
     void onRegistered() Q_DECL_OVERRIDE;
-    void onStartup() Q_DECL_OVERRIDE;
-    void onShutdown() Q_DECL_OVERRIDE;
+    void onEngineStartup() Q_DECL_OVERRIDE;
+    void onEngineShutdown() Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;
 
     Q_DECLARE_PRIVATE(QLogicAspect)