diff options
| author |  Rolf Eike Beer <eike@sf-mail.de> | 2019-04-01 22:15:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 12:59:17 +0300 |
| commit | c4c8094e32ad78dee558a80584470172f48c45b1 (patch) | |
| tree | 4fede2acf0f1a3cee2182d96b1b3efa33e4fd8ff /core/qt-ble.cpp | |
| parent | 2b9ca488fd18dc9d65d42dc5900e120a07e5b3f6 (diff) | |
| download | subsurface-c4c8094e32ad78dee558a80584470172f48c45b1.tar.gz | |
get rid of some foreach and Q_FOREACH constructs
See https://www.kdab.com/goodbye-q_foreach/
This is reduced to the places where the container is const or can be made const
without the need to always introduce an extra variable. Sadly qAsConst (Qt 5.7)
and std::as_const (C++17) are not available in all supported setups.
Also do some minor cleanups along the way.
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'core/qt-ble.cpp')
| -rw-r--r-- | core/qt-ble.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/qt-ble.cpp b/core/qt-ble.cpp index 9626042b5..9ee5def51 100644 --- a/core/qt-ble.cpp +++ b/core/qt-ble.cpp @@ -341,7 +341,7 @@ dc_status_t BLEObject::setHwCredit(unsigned int c) return DC_STATUS_SUCCESS; } -dc_status_t BLEObject::setupHwTerminalIo(QList<QLowEnergyCharacteristic> allC) +dc_status_t BLEObject::setupHwTerminalIo(const QList<QLowEnergyCharacteristic> &allC) { /* This initalizes the Terminal I/O client as described in * http://www.telit.com/fileadmin/user_upload/products/Downloads/sr-rf/BlueMod/TIO_Implementation_Guide_r04.pdf * Referenced section numbers below are from that document. @@ -479,16 +479,16 @@ dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, dc_user_ return r; } } else { - foreach (const QLowEnergyCharacteristic &c, list) { + for (const QLowEnergyCharacteristic &c: list) { if (!is_read_characteristic(c)) continue; qDebug() << "Using read characteristic" << c.uuid(); - QList<QLowEnergyDescriptor> l = c.descriptors(); + const QList<QLowEnergyDescriptor> l = c.descriptors(); QLowEnergyDescriptor d = l.first(); - foreach (const QLowEnergyDescriptor &tmp, l) { + for (const QLowEnergyDescriptor &tmp: l) { if (tmp.type() == QBluetoothUuid::ClientCharacteristicConfiguration) { d = tmp; break; |