diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-05 09:07:41 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-22 11:10:38 +0000 |
| commit | 5a149c75d71e5d50e941d773a3ef17e1372de100 (patch) | |
| tree | 5f647a1c899ba5b164bfb2566af487aedeec43db | |
| parent | e10ce3bfa5ed2290c9d210509bad3238d9bec8bc (diff) | |
Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-free and warning_clean
Change-Id: I67813e8d2d27d39d772099b2d9d77bbe9bfa476e
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index aefa1e7..d1e1c4c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ load(qt_build_config) +CONFIG += warning_clean +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.8.0 diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp index 009e0eb..85b8e9e 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp @@ -541,14 +541,14 @@ bool QAndroidGamepadBackend::handleGenericMotionEvent(jobject event) if (!axisValues.isEmpty()) { FunctionEvent::runOnQtThread(this, [this, deviceId, axisValues]{ - foreach (const auto &axisValue, axisValues) + for (const auto &axisValue : axisValues) emit gamepadAxisMoved(deviceId, axisValue.first, axisValue.second); }); } if (!buttonValues.isEmpty()) { FunctionEvent::runOnQtThread(this, [this, deviceId, buttonValues]{ - foreach (const auto &buttonValue, buttonValues) + for (const auto &buttonValue : buttonValues) if (buttonValue.second) emit gamepadButtonPressed(deviceId, buttonValue.first, fabs(buttonValue.second)); else diff --git a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp index 1ad6b46..8d6f305 100644 --- a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp +++ b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp @@ -111,8 +111,8 @@ bool QEvdevGamepadBackend::start() qCDebug(lcEGB) << "Using device discovery"; m_discovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Joystick, this); if (m_discovery) { - QStringList devices = m_discovery->scanConnectedDevices(); - foreach (const QString &devStr, devices) { + const QStringList devices = m_discovery->scanConnectedDevices(); + for (const QString &devStr : devices) { device = devStr.toUtf8(); m_devices.append(newDevice(device)); } @@ -138,7 +138,7 @@ QEvdevGamepadDevice *QEvdevGamepadBackend::newDevice(const QByteArray &device) QEvdevGamepadDevice *QEvdevGamepadBackend::device(int deviceId) { - foreach (QEvdevGamepadDevice *device, m_devices) + for (QEvdevGamepadDevice *device : qAsConst(m_devices)) if (device->deviceId() == deviceId) return device; return nullptr; |