diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-29 09:41:43 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 19:26:08 +0000 |
commit | e78ca033b4b974332b065302b714d1c0d46c979e (patch) | |
tree | f52af3f572f9c23943cf2e2992b7213505e59107 /src/core/aspects | |
parent | d65649d92e94e1e44ca394a3dc814a7f7429c34b (diff) |
QAspectManager: eradicate Q_FOREACH loops
... by replacing them with C++11 range-for loops.
Saves 1.1KiB (0.5%) in text size on optimized GCC 5.3
Linux AMD64 builds.
Change-Id: I9f197dc25ef1b3f20d3dc4734da1167a0192022b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects')
-rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 8aa6e1b2a..64cb33f11 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -106,7 +106,7 @@ void QAspectManager::shutdown() { qCDebug(Aspects) << Q_FUNC_INFO; - Q_FOREACH (QAbstractAspect *aspect, m_aspects) { + for (QAbstractAspect *aspect : qAsConst(m_aspects)) { aspect->onCleanup(); m_changeArbiter->unregisterSceneObserver(aspect->d_func()); } @@ -122,15 +122,14 @@ void QAspectManager::setRootEntity(Qt3DCore::QEntity *root) if (m_root) { // Allow each aspect chance to cleanup any resources from this scene - Q_FOREACH (QAbstractAspect *aspect, m_aspects) { + for (QAbstractAspect *aspect : qAsConst(m_aspects)) aspect->onCleanup(); - } } m_root = root; if (m_root) { - Q_FOREACH (QAbstractAspect *aspect, m_aspects) + for (QAbstractAspect *aspect : qAsConst(m_aspects)) aspect->d_func()->registerAspect(m_root); m_runMainLoop.fetchAndStoreOrdered(1); } @@ -183,7 +182,7 @@ void QAspectManager::exec() // We are about to enter the main loop. Give aspects a chance to do any last // pieces of initialization qCDebug(Aspects) << "Calling onStartup() for each aspect"; - Q_FOREACH (QAbstractAspect *aspect, m_aspects) + for (QAbstractAspect *aspect : qAsConst(m_aspects)) aspect->onStartup(); } @@ -221,7 +220,7 @@ void QAspectManager::exec() // Give aspects a chance to perform any shutdown actions. This may include unqueuing // any blocking work on the main thread that could potentially deadlock during shutdown. qCDebug(Aspects) << "Calling onShutdown() for each aspect"; - Q_FOREACH (QAbstractAspect *aspect, m_aspects) + for (QAbstractAspect *aspect : qAsConst(m_aspects)) aspect->onShutdown(); } } |