diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-02-25 15:45:39 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-16 15:50:01 +0000 |
commit | a8371dccd60a097678239edc510e5bb4624b52b8 (patch) | |
tree | 9bf581700cb10775389e6bd2e81aa24ea303a9f6 /src/core/aspects | |
parent | b00a98f37f57a344671fc5ab06613f1b577b5995 (diff) |
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>
Diffstat (limited to 'src/core/aspects')
-rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 4 | ||||
-rw-r--r-- | src/core/aspects/qabstractaspect.h | 4 | ||||
-rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 4 |
3 files changed, 6 insertions, 6 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"; |