diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-15 12:25:53 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-17 09:17:37 +0000 |
| commit | 0684f372062c7e71f549e4d896bf9a05e1bec77a (patch) | |
| tree | fda87952591ca9235c36f00f218b847800ffb27c /src | |
| parent | 8ef01dadfde7ad5bbe0bc42f145aa18d557d0c7a (diff) | |
Get rid of isShuttingDown()
It is misplaced (if need be it'd be more logical on QAspectEngine API)
and used only once from a place where we already depend on private API
anyway.
Change-Id: I55fcee3a11830515c90e984a186040312898df56
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 6 | ||||
| -rw-r--r-- | src/core/aspects/qabstractaspect.h | 2 | ||||
| -rw-r--r-- | src/logic/manager.cpp | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index f63067119..aae7eafad 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -194,12 +194,6 @@ QAbstractAspectJobManager *QAbstractAspectPrivate::jobManager() const return m_jobManager; } -bool QAbstractAspect::isShuttingDown() const -{ - Q_D(const QAbstractAspect); - return d->m_aspectManager->isShuttingDown(); -} - void QAbstractAspect::onStartup() { } diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 057473305..87d5bcee2 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -68,8 +68,6 @@ class QT3DCORESHARED_EXPORT QAbstractAspect public: explicit QAbstractAspect(QObject *parent = 0); - bool isShuttingDown() const; - virtual QVariant executeCommand(const QStringList &args); protected: diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp index 6ef0f9364..a20dffe9a 100644 --- a/src/logic/manager.cpp +++ b/src/logic/manager.cpp @@ -36,6 +36,8 @@ #include "manager_p.h" #include "qlogicaspect.h" +#include <Qt3DCore/private/qabstractaspect_p.h> +#include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DLogic/private/executor_p.h> #include <Qt3DLogic/private/managers_p.h> #include <QtCore/qcoreapplication.h> @@ -88,7 +90,7 @@ void Manager::triggerLogicFrameUpdates() // Don't use blocking queued connections to main thread if it is already // in the process of shutting down as that will deadlock. - if (m_logicAspect->isShuttingDown()) + if (Qt3DCore::QAbstractAspectPrivate::get(m_logicAspect)->m_aspectManager->isShuttingDown()) return; // Trigger the main thread to process logic frame updates for each |