diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-04-30 10:25:27 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-13 11:27:08 +0000 |
commit | 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 (patch) | |
tree | e6f9334060f66448d9dff69c723eab6871ff3485 /examples | |
parent | a11fa1dfd529948da961d3d292926a15f9b7005b (diff) |
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>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/serialport/blockingmaster/dialog.cpp | 3 | ||||
-rw-r--r-- | examples/serialport/blockingslave/dialog.cpp | 3 | ||||
-rw-r--r-- | examples/serialport/cenumerator/main.cpp | 6 | ||||
-rw-r--r-- | examples/serialport/enumerator/main.cpp | 3 | ||||
-rw-r--r-- | examples/serialport/terminal/settingsdialog.cpp | 3 |
5 files changed, 11 insertions, 7 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(); |