From 65da5b36152dcf3228ee4f2999873d4c465d622f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 23 Oct 2018 22:04:53 -0300 Subject: [PATCH] qgcunittest: Change from foreach to c++11 for MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/qgcunittest/MavlinkLogTest.cc | 2 +- src/qgcunittest/RadioConfigTest.cc | 4 ++-- src/qgcunittest/UnitTest.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qgcunittest/MavlinkLogTest.cc b/src/qgcunittest/MavlinkLogTest.cc index 4a66ebf77..5810cd49c 100644 --- a/src/qgcunittest/MavlinkLogTest.cc +++ b/src/qgcunittest/MavlinkLogTest.cc @@ -38,7 +38,7 @@ void MavlinkLogTest::init(void) // Make sure temp directory is clear of mavlink logs QDir tmpDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation)); QStringList logFiles(tmpDir.entryList(QStringList(QString("*.%1").arg(_logFileExtension)), QDir::Files)); - foreach(const QString &logFile, logFiles) { + for(const QString &logFile: logFiles) { bool success = tmpDir.remove(logFile); Q_UNUSED(success); Q_ASSERT(success); diff --git a/src/qgcunittest/RadioConfigTest.cc b/src/qgcunittest/RadioConfigTest.cc index 8218af029..123b7a5b8 100644 --- a/src/qgcunittest/RadioConfigTest.cc +++ b/src/qgcunittest/RadioConfigTest.cc @@ -207,7 +207,7 @@ void RadioConfigTest::_init(MAV_AUTOPILOT firmwareType) // Find the radio component QObject* vehicleComponent = NULL; - foreach (const QVariant& varVehicleComponent, _autopilot->vehicleComponents()) { + for (const QVariant& varVehicleComponent: _autopilot->vehicleComponents()) { if (firmwareType == MAV_AUTOPILOT_PX4) { PX4RadioComponent* radioComponent = qobject_cast(varVehicleComponent.value()); if (radioComponent) { @@ -370,7 +370,7 @@ void RadioConfigTest::_fullCalibrationWorker(MAV_AUTOPILOT firmwareType) QStringList switchList; switchList << "RC_MAP_MODE_SW" << "RC_MAP_LOITER_SW" << "RC_MAP_RETURN_SW" << "RC_MAP_POSCTL_SW" << "RC_MAP_ACRO_SW"; - foreach (const QString &switchParam, switchList) { + for (const QString &switchParam: switchList) { Q_ASSERT(_vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, switchParam)->rawValue().toInt() != channel + 1); } } diff --git a/src/qgcunittest/UnitTest.cc b/src/qgcunittest/UnitTest.cc index a39b8cd4d..545d26536 100644 --- a/src/qgcunittest/UnitTest.cc +++ b/src/qgcunittest/UnitTest.cc @@ -81,7 +81,7 @@ int UnitTest::run(QString& singleTest) { int ret = 0; - foreach (QObject* test, _testList()) { + for (QObject* test: _testList()) { if (singleTest.isEmpty() || singleTest == test->objectName()) { QStringList args; args << "*" << "-maxwarnings" << "0"; -- 2.22.0