summaryrefslogtreecommitdiffstats
path: root/src/render/picking/qobjectpicker.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-02-29 01:01:50 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-05 13:21:20 +0000
commit8176659e1f07baafab77471e3eac75cd9ae4b704 (patch)
treec1d9c936fc1196eeb3a1187d5adfc2606bfb162c /src/render/picking/qobjectpicker.cpp
parenta72629194293dd29ee9c9f6964ac798f985b5e61 (diff)
render: eradicate Q_FOREACH loops [remaining low-risk]
... by replacing them with C++11 range-for loops. To avoid detaches of these mutable Qt containers, wrap the container in qAsConst(), where needed. This is the batch with low-risk changes. They operate on local containers or the loop body clearly does not cause the container to change. Saves ~3.8KiB in text size on optimized GCC 6.0 Linux AMD64 builds. Change-Id: I9c9669dd89f44d371d7a9cd4fc83a7930a06ce17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/picking/qobjectpicker.cpp')
-rw-r--r--src/render/picking/qobjectpicker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index b46fef63b..8bb734d9c 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -211,11 +211,11 @@ void QObjectPickerPrivate::propagateEvent(QPickEvent *event, EventType type)
if (!m_entities.isEmpty()) {
Qt3DCore::QEntity *entity = m_entities.first();
Qt3DCore::QEntity *parentEntity = nullptr;
- Qt3DRender::QObjectPicker *objectPicker = nullptr;
while (entity != nullptr && entity->parent() != nullptr && !event->isAccepted()) {
parentEntity = entity->parentEntity();
- Q_FOREACH (Qt3DCore::QComponent *c, parentEntity->components()) {
- if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != nullptr) {
+ const auto components = parentEntity->components();
+ for (Qt3DCore::QComponent *c : components) {
+ if (auto objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) {
QObjectPickerPrivate *objectPickerPrivate = static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(objectPicker));
switch (type) {
case Pressed: