Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-free

Change-Id: I4ec52799514b750c158e3cb8e6c38d1f1063c6c5
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

13 files changed, 30 insertions, 25 deletions

diff --git a/.qmake.conf b/.qmake.conf
index f03d05c..74c762b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,5 @@
 load(qt_build_config)
 CONFIG += warning_clean
+DEFINES += QT_NO_FOREACH
 
 MODULE_VERSION = 5.9.0
diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index 48371d4..90b74b3 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -141,7 +141,7 @@ QString ConnectDialog::configurationValue(QCanBusDevice::ConfigurationKey key)
 {
     QVariant result;
 
-    foreach (const ConfigurationItem &item, m_currentSettings.configurations) {
+    for (const ConfigurationItem &item : qAsConst(m_currentSettings.configurations)) {
         if (item.first == key) {
             result = item.second;
             break;
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index ac24f43..2e75037 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -129,7 +129,7 @@ void MainWindow::connectDevice()
             this, &MainWindow::framesWritten);
 
     if (p.useConfigurationEnabled) {
-        foreach (const ConnectDialog::ConfigurationItem &item, p.configurations)
+        for (const ConnectDialog::ConfigurationItem &item : p.configurations)
             m_canDevice->setConfigurationParameter(item.first, item.second);
     }
 
diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp
index c4149e0..a01e5c7 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.cpp
+++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp
@@ -70,7 +70,8 @@ MainWindow::MainWindow(QWidget *parent)
     setupUi(this);
     s_instance = this;
 
-    foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
+    const auto ports = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : ports)
         serialPortCombo->addItem(info.portName(), false);
     serialPortCombo->insertSeparator(serialPortCombo->count());
     serialPortCombo->addItem(QStringLiteral("Add port..."), true);
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index 50d5faf..08ef168 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -283,7 +283,7 @@ void MainWindow::setupDeviceData()
     }
 
     bool ok;
-    foreach (QLineEdit *widget, registers) {
+    for (QLineEdit *widget : qAsConst(registers)) {
         if (widget->objectName().startsWith(QStringLiteral("inReg"))) {
             modbusDevice->setData(QModbusDataUnit::InputRegisters, widget->property("ID").toInt(),
                 widget->text().toInt(&ok, 16));
@@ -301,19 +301,19 @@ void MainWindow::setupWidgetContainers()
 
     QRegularExpression regexp(QStringLiteral("coils_(?<ID>\\d+)"));
     const QList<QCheckBox *> coils = findChildren<QCheckBox *>(regexp);
-    foreach (QCheckBox *cbx, coils)
+    for (QCheckBox *cbx : coils)
         coilButtons.addButton(cbx, regexp.match(cbx->objectName()).captured("ID").toInt());
     connect(&coilButtons, SIGNAL(buttonClicked(int)), this, SLOT(coilChanged(int)));
 
     regexp.setPattern(QStringLiteral("disc_(?<ID>\\d+)"));
     const QList<QCheckBox *> discs = findChildren<QCheckBox *>(regexp);
-    foreach (QCheckBox *cbx, discs)
+    for (QCheckBox *cbx : discs)
         discreteButtons.addButton(cbx, regexp.match(cbx->objectName()).captured("ID").toInt());
     connect(&discreteButtons, SIGNAL(buttonClicked(int)), this, SLOT(discreteInputChanged(int)));
 
     regexp.setPattern(QLatin1String("(in|hold)Reg_(?<ID>\\d+)"));
     const QList<QLineEdit *> qle = findChildren<QLineEdit *>(regexp);
-    foreach (QLineEdit *lineEdit, qle) {
+    for (QLineEdit *lineEdit : qle) {
         registers.insert(lineEdit->objectName(), lineEdit);
         lineEdit->setProperty("ID", regexp.match(lineEdit->objectName()).captured("ID").toInt());
         lineEdit->setValidator(new QRegExpValidator(QRegExp(QStringLiteral("[0-9a-f]{0,4}"),
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index dd7e4cb..83d36c6 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -484,7 +484,8 @@ bool PeakCanBackend::open()
 
         // apply all stored configurations except bitrate, because
         // the bitrate can not be applied after opening of device
-        foreach (int key, configurationKeys()) {
+        const auto keys = configurationKeys();
+        for (int key : keys) {
             if (key == QCanBusDevice::BitRateKey)
                 continue;
             const QVariant param = configurationParameter(key);
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index c506706..f9f28cc 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -355,7 +355,8 @@ bool SocketCanBackend::connectSocket()
             this, &SocketCanBackend::readSocket);
 
     //apply all stored configurations
-    foreach (int key, configurationKeys()) {
+    const auto keys = configurationKeys();
+    for (int key : keys) {
         const QVariant param = configurationParameter(key);
         bool success = applyConfigurationParameter(key, param);
         if (!success) {
@@ -372,9 +373,8 @@ void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value)
     if (key == QCanBusDevice::RawFilterKey) {
         //verify valid/supported filters
 
-        QList<QCanBusDevice::Filter> filters
-                = value.value<QList<QCanBusDevice::Filter> >();
-        foreach (QCanBusDevice::Filter f, filters) {
+        const auto filters = value.value<QList<QCanBusDevice::Filter> >();
+        for (QCanBusDevice::Filter f : filters) {
             switch (f.type) {
             case QCanBusFrame::UnknownFrame:
 
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 390adee..ea33177 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -109,7 +109,7 @@ static void DRV_CALLBACK_TYPE canRxEventCallback(quint32 index, TCanMsg *frame,
     Q_UNUSED(count);
 
     QMutexLocker lock(&channelsGuard);
-    foreach (TinyCanBackendPrivate *p, *qChannels()) {
+    for (TinyCanBackendPrivate *p : qAsConst(*qChannels())) {
         if (p->channelIndex == int(index)) {
             p->startRead();
             return;
@@ -506,7 +506,8 @@ bool TinyCanBackend::open()
         }
 
         // apply all stored configurations
-        foreach (int key, configurationKeys()) {
+        const auto keys = configurationKeys();
+        for (int key : keys) {
             const QVariant param = configurationParameter(key);
             const bool success = d->setConfigurationParameter(key, param);
             if (!success) {
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp
index f094469..bfded26 100644
--- a/src/serialbus/qcanbusdevice.cpp
+++ b/src/serialbus/qcanbusdevice.cpp
@@ -336,7 +336,7 @@ QVariant QCanBusDevice::configurationParameter(int key) const
 {
     Q_D(const QCanBusDevice);
 
-    foreach (const ConfigEntry &e, d->configOptions) {
+    for (const ConfigEntry &e : d->configOptions) {
         if (e.first == key)
             return e.second;
     }
@@ -356,7 +356,7 @@ QVector<int> QCanBusDevice::configurationKeys() const
     Q_D(const QCanBusDevice);
 
     QVector<int> result;
-    foreach (const ConfigEntry &e, d->configOptions)
+    for (const ConfigEntry &e : d->configOptions)
         result.append(e.first);
 
     return result;
diff --git a/src/serialbus/qmodbusserver.cpp b/src/serialbus/qmodbusserver.cpp
index 1a16347..c119e21 100644
--- a/src/serialbus/qmodbusserver.cpp
+++ b/src/serialbus/qmodbusserver.cpp
@@ -994,7 +994,7 @@ QModbusResponse QModbusServerPrivate::processWriteMultipleCoilsRequest(const QMo
     // range is numberOfCoils and therefore index too.
     quint16 coil = numberOfCoils;
     qint32 currentBit = 8 - ((byteCount * 8) - numberOfCoils);
-    foreach (const auto &currentByte, bytes) {
+    for (const auto &currentByte : qAsConst(bytes)) {
         for (currentBit -= 1; currentBit >= 0; --currentBit)
             coils.setValue(--coil, currentByte[currentBit]);
         currentBit = 8;
@@ -1243,7 +1243,7 @@ QModbusResponse QModbusServerPrivate::processEncapsulatedInterfaceTransportReque
                 payload[5] = quint8(0x00); // number of objects
 
                 const QList<int> objectIds = objectPool.objectIds();
-                foreach (int id, objectIds) {
+                for (int id : objectIds) {
                     if (id < objectId)
                         continue;
                     if (id > lastObjectId)
diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h
index 2d7a365..bb3bc74 100644
--- a/src/serialbus/qmodbustcpclient_p.h
+++ b/src/serialbus/qmodbustcpclient_p.h
@@ -242,14 +242,13 @@ public:
 
         qCDebug(QT_MODBUS) << "(TCP client) Cleanup of pending requests";
 
-        foreach (auto tid, m_transactionStore.keys()) {
-            const QueueElement elem = m_transactionStore.take(tid);
+        for (const auto &elem : qAsConst(m_transactionStore)) {
             if (elem.reply.isNull())
                 continue;
-
             elem.reply->setError(QModbusDevice::ReplyAbortedError,
                                  QModbusClient::tr("Reply aborted due to connection closure."));
         }
+        m_transactionStore.clear();
     }
 
     // This doesn't overflow, it rather "wraps around". Expected.
diff --git a/src/serialbus/qmodbustcpserver.cpp b/src/serialbus/qmodbustcpserver.cpp
index 07a3363..9232bb3 100644
--- a/src/serialbus/qmodbustcpserver.cpp
+++ b/src/serialbus/qmodbustcpserver.cpp
@@ -131,7 +131,7 @@ void QModbusTcpServer::close()
     if (d->m_tcpServer->isListening())
         d->m_tcpServer->close();
 
-    foreach (auto socket, d->connections)
+    for (auto socket : qAsConst(d->connections))
         socket->disconnectFromHost();
 
     setState(QModbusDevice::UnconnectedState);
diff --git a/tests/auto/qmodbusdataunit/tst_qmodbusdataunit.cpp b/tests/auto/qmodbusdataunit/tst_qmodbusdataunit.cpp
index 378fd75..7379c4b 100644
--- a/tests/auto/qmodbusdataunit/tst_qmodbusdataunit.cpp
+++ b/tests/auto/qmodbusdataunit/tst_qmodbusdataunit.cpp
@@ -65,10 +65,12 @@ void tst_QModbusDataUnit::constructors()
     QModbusDataUnit coils(QModbusDataUnit::Coils, 15, 20);
     QCOMPARE(coils.registerType(), QModbusDataUnit::Coils);
     QCOMPARE(coils.startAddress(), 15);
-    QCOMPARE(coils.values().size(), 20);
-    QCOMPARE(coils.values(), QVector<quint16>(20));
-    foreach (auto val, coils.values())
+    const auto values = coils.values();
+    QCOMPARE(values.size(), 20);
+    QCOMPARE(values, QVector<quint16>(20));
+    for (auto val : values) {
         QCOMPARE(val, quint16(0));
+    }
     QCOMPARE(coils.valueCount(), 20u);
 
     QModbusDataUnit unit2(QModbusDataUnit::HoldingRegisters, 3, QVector<quint16>() << 9);