summaryrefslogtreecommitdiffstats
path: root/src/input/backend/qabstractphysicaldevicebackendnode.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-02-29 01:01:50 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-04-30 20:52:01 +0000
commit0c03bd8409838de5a4f6323d1f07b4d29cc3e3bc (patch)
tree98f5535b2b215253a5841b6aa58ddada447d5064 /src/input/backend/qabstractphysicaldevicebackendnode.cpp
parent2e48010cc33000e19f79f48a77612076b12720e5 (diff)
input/backend: eradicate Q_FOREACH loops [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 ~5.4KiB (1.08%) in text size on optimized GCC 6.0 Linux AMD64 builds. Change-Id: I8be9ac2e0d7a200d9a4a286f06f1da26377e366d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/backend/qabstractphysicaldevicebackendnode.cpp')
-rw-r--r--src/input/backend/qabstractphysicaldevicebackendnode.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index c3f4aa8bb..716e5cbaf 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -63,7 +63,7 @@ QVector<int> variantListToVector(const QVariantList &list)
{
QVector<int> v(list.size());
int i = 0;
- Q_FOREACH (const QVariant &e, list) {
+ for (const QVariant &e : list) {
v[i++] = e.toInt();
}
return v;
@@ -154,10 +154,12 @@ void QAbstractPhysicalDeviceBackendNode::updateFromPeer(Qt3DCore::QNode *peer)
{
Q_D(QAbstractPhysicalDeviceBackendNode);
QAbstractPhysicalDevice *physicalDevice = static_cast<QAbstractPhysicalDevice *>(peer);
- Q_FOREACH (QAxisSetting *axisSetting, physicalDevice->axisSettings()) {
+ const auto axisSettings = physicalDevice->axisSettings();
+ for (QAxisSetting *axisSetting : axisSettings) {
// Each axis setting can apply to more than one axis. If an axis is
// mentioned in more than one setting, we use the last one
- Q_FOREACH (int axisId, variantListToVector(axisSetting->axes()))
+ const auto axisIds = variantListToVector(axisSetting->axes());
+ for (int axisId : axisIds)
d->addAxisSetting(axisId, axisSetting->id());
}
}
@@ -190,7 +192,8 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene
if (change->propertyName() == QByteArrayLiteral("axisSettings")) {
const auto axisSettingId = change->addedNodeId();
Input::AxisSetting *axisSetting = d->getAxisSetting(axisSettingId);
- Q_FOREACH (int axisId, axisSetting->axes())
+ const auto axisIds = axisSetting->axes();
+ for (int axisId : axisIds)
d->addAxisSetting(axisId, axisSettingId);
}
break;