Replace 'Q_FOREACH' with the range-based 'for'

Change-Id: I057267982ac946ce1ec863a79120cd21cd563c4b
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

11 files changed, 43 insertions, 32 deletions

diff --git a/examples/serialport/blockingmaster/dialog.cpp b/examples/serialport/blockingmaster/dialog.cpp
index 81014249..c1ca850d 100644
--- a/examples/serialport/blockingmaster/dialog.cpp
+++ b/examples/serialport/blockingmaster/dialog.cpp
@@ -74,7 +74,8 @@ Dialog::Dialog(QWidget *parent)
     , statusLabel(new QLabel(tr("Status: Not running.")))
     , runButton(new QPushButton(tr("Start")))
 {
-    foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos)
         serialPortComboBox->addItem(info.portName());
 
     waitResponseSpinBox->setRange(0, 10000);
diff --git a/examples/serialport/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp
index 3cef0cf6..8550773f 100644
--- a/examples/serialport/blockingslave/dialog.cpp
+++ b/examples/serialport/blockingslave/dialog.cpp
@@ -77,7 +77,8 @@ Dialog::Dialog(QWidget *parent)
     waitRequestSpinBox->setRange(0, 10000);
     waitRequestSpinBox->setValue(10000);
 
-    foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos)
         serialPortComboBox->addItem(info.portName());
 
     QGridLayout *mainLayout = new QGridLayout;
diff --git a/examples/serialport/cenumerator/main.cpp b/examples/serialport/cenumerator/main.cpp
index 7166b0b8..f8050219 100644
--- a/examples/serialport/cenumerator/main.cpp
+++ b/examples/serialport/cenumerator/main.cpp
@@ -58,16 +58,16 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     QTextStream out(stdout);
-    QList<QSerialPortInfo> serialPortInfoList = QSerialPortInfo::availablePorts();
+    const auto serialPortInfos = QSerialPortInfo::availablePorts();
 
-    out << QObject::tr("Total number of ports available: ") << serialPortInfoList.count() << endl;
+    out << QObject::tr("Total number of ports available: ") << serialPortInfos.count() << endl;
 
     const QString blankString = QObject::tr("N/A");
     QString description;
     QString manufacturer;
     QString serialNumber;
 
-    foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) {
+    for (const QSerialPortInfo &serialPortInfo : serialPortInfos) {
         description = serialPortInfo.description();
         manufacturer = serialPortInfo.manufacturer();
         serialNumber = serialPortInfo.serialNumber();
diff --git a/examples/serialport/enumerator/main.cpp b/examples/serialport/enumerator/main.cpp
index a997bf52..fa925daf 100644
--- a/examples/serialport/enumerator/main.cpp
+++ b/examples/serialport/enumerator/main.cpp
@@ -64,7 +64,8 @@ int main(int argc, char *argv[])
 
     QVBoxLayout *layout = new QVBoxLayout;
 
-    foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos) {
         QString s = QObject::tr("Port: ") + info.portName() + "\n"
                     + QObject::tr("Location: ") + info.systemLocation() + "\n"
                     + QObject::tr("Description: ") + info.description() + "\n"
diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp
index ded4b18b..f9b86057 100644
--- a/examples/serialport/terminal/settingsdialog.cpp
+++ b/examples/serialport/terminal/settingsdialog.cpp
@@ -171,7 +171,8 @@ void SettingsDialog::fillPortsInfo()
     QString description;
     QString manufacturer;
     QString serialNumber;
-    foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos) {
         QStringList list;
         description = info.description();
         manufacturer = info.manufacturer();
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 4d17b7d2..41dad55f 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -125,7 +125,7 @@ QString serialPortLockFilePath(const QString &portName)
 
     QString lockFilePath;
 
-    foreach (const QString &lockDirectoryPath, lockDirectoryPaths) {
+    for (const QString &lockDirectoryPath : lockDirectoryPaths) {
         const QString filePath = lockDirectoryPath + fileName;
 
         QFileInfo lockDirectoryInfo(lockDirectoryPath);
@@ -139,7 +139,7 @@ QString serialPortLockFilePath(const QString &portName)
 
     if (lockFilePath.isEmpty()) {
         qWarning("The following directories are not readable or writable for detaling with lock files\n");
-        foreach (const QString &lockDirectoryPath, lockDirectoryPaths)
+        for (const QString &lockDirectoryPath : lockDirectoryPaths)
             qWarning("\t%s\n", qPrintable(lockDirectoryPath));
         return QString();
     }
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp
index 76c18da2..acd01792 100644
--- a/src/serialport/qserialportinfo.cpp
+++ b/src/serialport/qserialportinfo.cpp
@@ -88,9 +88,10 @@ QSerialPortInfo::QSerialPortInfo(const QSerialPortInfo &other)
 */
 QSerialPortInfo::QSerialPortInfo(const QSerialPort &port)
 {
-    foreach (const QSerialPortInfo &serialPortInfo, availablePorts()) {
-        if (port.portName() == serialPortInfo.portName()) {
-            *this = serialPortInfo;
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos) {
+        if (port.portName() == info.portName()) {
+            *this = info;
             break;
         }
     }
@@ -105,9 +106,10 @@ QSerialPortInfo::QSerialPortInfo(const QSerialPort &port)
 */
 QSerialPortInfo::QSerialPortInfo(const QString &name)
 {
-    foreach (const QSerialPortInfo &serialPortInfo, availablePorts()) {
-        if (name == serialPortInfo.portName()) {
-            *this = serialPortInfo;
+    const auto infos = QSerialPortInfo::availablePorts();
+    for (const QSerialPortInfo &info : infos) {
+        if (name == info.portName()) {
+            *this = info;
             break;
         }
     }
diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp
index 552db894..219cd7c9 100644
--- a/src/serialport/qserialportinfo_freebsd.cpp
+++ b/src/serialport/qserialportinfo_freebsd.cpp
@@ -122,7 +122,7 @@ static QVector<int> nextOid(const QVector<int> &previousOid)
     QVector<int> mib;
     mib.append(0); // Magic undocumented code (CTL_UNSPEC ?)
     mib.append(2); // Magic undocumented code
-    foreach (int code, previousOid)
+    for (int code : previousOid)
         mib.append(code);
 
     size_t requiredLength = 0;
@@ -144,7 +144,7 @@ static NodeInfo nodeForOid(const QVector<int> &oid)
     QVector<int> mib;
     mib.append(0); // Magic undocumented code (CTL_UNSPEC ?)
     mib.append(1); // Magic undocumented code
-    foreach (int code, oid)
+    for (int code : oid)
         mib.append(code);
 
     // query node name
@@ -234,7 +234,8 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
     QList<QSerialPortInfo> cuaCandidates;
     QList<QSerialPortInfo> ttyCandidates;
 
-    foreach (const QString &portName, deviceDir.entryList()) {
+    const auto portNames = deviceDir.entryList();
+    for (const QString &portName : portNames) {
         if (portName.endsWith(QLatin1String(".init"))
                 || portName.endsWith(QLatin1String(".lock"))) {
             continue;
@@ -244,7 +245,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
         priv.portName = portName;
         priv.device = QSerialPortInfoPrivate::portNameToSystemLocation(portName);
 
-        foreach (const NodeInfo &node, nodes) {
+        for (const NodeInfo &node : nodes) {
             const int pnpinfoindex = node.name.indexOf(QLatin1String("\%pnpinfo"));
             if (pnpinfoindex == -1)
                 continue;
@@ -288,7 +289,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
             const QString descnode = QString(QLatin1String("%1\%desc")).arg(nodebase);
 
             // search for description and manufacturer properties
-            foreach (const NodeInfo &node, nodes) {
+            for (const NodeInfo &node : nodes) {
                 if (node.name != descnode)
                     continue;
 
@@ -313,10 +314,10 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
 
     QList<QSerialPortInfo> serialPortInfoList;
 
-    foreach (const QSerialPortInfo &cuaCandidate, cuaCandidates) {
+    for (const QSerialPortInfo &cuaCandidate : qAsConst(cuaCandidates)) {
         const QString cuaPortName = cuaCandidate.portName();
         const QString cuaToken = deviceProperty(cuaPortName, "cua");
-        foreach (const QSerialPortInfo &ttyCandidate, ttyCandidates) {
+        for (const QSerialPortInfo &ttyCandidate : qAsConst(ttyCandidates)) {
             const QString ttyPortName = ttyCandidate.portName();
             const QString ttyToken = deviceProperty(ttyPortName, "tty");
             if (cuaToken != ttyToken)
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index a93ac058..3a379996 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -90,7 +90,8 @@ static QStringList filteredDeviceFilePaths()
         deviceDir.setNameFilters(deviceFileNameFilterList);
         deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
         QStringList deviceFilePaths;
-        foreach (const QFileInfo &deviceFileInfo, deviceDir.entryInfoList()) {
+        const auto deviceFileInfos = deviceDir.entryInfoList();
+        for (const QFileInfo &deviceFileInfo : deviceFileInfos) {
             const QString deviceAbsoluteFilePath = deviceFileInfo.absoluteFilePath();
 
 #ifdef Q_OS_FREEBSD
@@ -115,7 +116,8 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices(bool &ok)
 {
     QList<QSerialPortInfo> serialPortInfoList;
 
-    foreach (const QString &deviceFilePath, filteredDeviceFilePaths()) {
+    const auto deviceFilePaths = filteredDeviceFilePaths();
+    for (const QString &deviceFilePath : deviceFilePaths) {
         QSerialPortInfoPrivate priv;
         priv.device = deviceFilePath;
         priv.portName = QSerialPortInfoPrivate::portNameFromSystemLocation(deviceFilePath);
@@ -250,7 +252,8 @@ QList<QSerialPortInfo> availablePortsBySysfs(bool &ok)
 
     QList<QSerialPortInfo> serialPortInfoList;
     ttySysClassDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (const QFileInfo &fileInfo, ttySysClassDir.entryInfoList()) {
+    const auto fileInfos = ttySysClassDir.entryInfoList();
+    for (const QFileInfo &fileInfo : fileInfos) {
         if (!fileInfo.isSymLink())
             continue;
 
diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index 262ff473..9c5305c1 100644
--- a/src/serialport/qserialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -344,9 +344,10 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
         ::SetupDiDestroyDeviceInfoList(deviceInfoSet);
     }
 
-    foreach (const QString &portName, portNamesFromHardwareDeviceMap()) {
-        if (std::find_if(serialPortInfoList.begin(), serialPortInfoList.end(),
-                         SerialPortNameEqualFunctor(portName)) == serialPortInfoList.end()) {
+    const auto portNames = portNamesFromHardwareDeviceMap();
+    for (const QString &portName : portNames) {
+        if (std::find_if(serialPortInfoList.cbegin(), serialPortInfoList.cend(),
+                         SerialPortNameEqualFunctor(portName)) == serialPortInfoList.cend()) {
             QSerialPortInfoPrivate priv;
             priv.portName = portName;
             priv.device =  QSerialPortInfoPrivate::portNameToSystemLocation(portName);
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp
index f100d353..b9d41b8d 100644
--- a/tests/auto/qserialport/tst_qserialport.cpp
+++ b/tests/auto/qserialport/tst_qserialport.cpp
@@ -265,7 +265,7 @@ void tst_QSerialPort::openExisting()
     QFETCH(bool, openResult);
     QFETCH(QSerialPort::SerialPortError, errorCode);
 
-    foreach (const QString &serialPortName, m_availablePortNames) {
+    for (const QString &serialPortName : qAsConst(m_availablePortNames)) {
         QSerialPort serialPort(serialPortName);
         QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error));
         QVERIFY(errorSpy.isValid());
@@ -1055,9 +1055,9 @@ void tst_QSerialPort::controlBreak()
     QVERIFY2(!timeout(), "Timed out when waiting for the read of break state.");
     QVERIFY(receiverPort.bytesAvailable() > 0);
 
-    foreach (const char c, receiverPort.readAll()) {
-        QCOMPARE(c, char(0));
-    }
+    const QByteArray actual = receiverPort.readAll();
+    const QByteArray expected(actual.size(), '\0');
+    QCOMPARE(actual, expected);
 
     QVERIFY(senderPort.setBreakEnabled(false));
     QCOMPARE(senderPort.isBreakEnabled(), false);