From 29db9519f379bd3938d5ed08c62b7693c5ad4e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 23 Oct 2018 22:04:22 -0300 Subject: [PATCH] VehicleSetup: 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/VehicleSetup/FirmwareUpgradeController.cc | 16 ++++++++-------- src/VehicleSetup/PX4FirmwareUpgradeThread.cc | 2 +- src/VehicleSetup/VehicleComponent.cc | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index e984f1c0e..cdbe47729 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -354,7 +354,7 @@ void FirmwareUpgradeController::_initFirmwareHash() #endif // PX4 Firmwares - foreach (const FirmwareType_t& firmwareType, px4MapFirmwareTypeToDir.keys()) { + for (const FirmwareType_t& firmwareType: px4MapFirmwareTypeToDir.keys()) { QString dir = px4MapFirmwareTypeToDir[firmwareType]; _rgPX4FMUV5Firmware.insert (FirmwareIdentifier(AutoPilotStackPX4, firmwareType, DefaultVehicleFirmware), px4Url.arg(dir).arg("v5")); _rgPX4FMUV4PROFirmware.insert (FirmwareIdentifier(AutoPilotStackPX4, firmwareType, DefaultVehicleFirmware), px4Url.arg(dir).arg("v4pro")); @@ -365,9 +365,9 @@ void FirmwareUpgradeController::_initFirmwareHash() #if !defined(NO_ARDUPILOT_DIALECT) // ArduPilot Firmwares - foreach (const FirmwareType_t& firmwareType, apmMapFirmwareTypeToDir.keys()) { + for (const FirmwareType_t& firmwareType: apmMapFirmwareTypeToDir.keys()) { QString firmwareTypeDir = apmMapFirmwareTypeToDir[firmwareType]; - foreach (const FirmwareVehicleType_t& vehicleType, apmMapVehicleTypeToDir.keys()) { + for (const FirmwareVehicleType_t& vehicleType: apmMapVehicleTypeToDir.keys()) { QString vehicleTypeDir = apmMapVehicleTypeToDir[vehicleType]; QString px4Dir = apmMapVehicleTypeToPX4Dir[vehicleType]; QString filename = apmMapVehicleTypeToFilename[vehicleType]; @@ -382,9 +382,9 @@ void FirmwareUpgradeController::_initFirmwareHash() #if !defined(NO_ARDUPILOT_DIALECT) // ArduPilot ChibiOS Firmwares - foreach (const FirmwareType_t& firmwareType, apmMapFirmwareTypeToDir.keys()) { + for (const FirmwareType_t& firmwareType: apmMapFirmwareTypeToDir.keys()) { QString firmwareTypeDir = apmMapFirmwareTypeToDir[firmwareType]; - foreach (const FirmwareVehicleType_t& vehicleType, apmChibiOSMapVehicleTypeToDir.keys()) { + for (const FirmwareVehicleType_t& vehicleType: apmChibiOSMapVehicleTypeToDir.keys()) { QString vehicleTypeDir = apmChibiOSMapVehicleTypeToDir[vehicleType]; QString fmuDir = apmChibiOSMapVehicleTypeToFmuDir[vehicleType]; QString filename = apmChibiOSMapVehicleTypeToFilename[vehicleType]; @@ -692,7 +692,7 @@ void FirmwareUpgradeController::_loadAPMVersions(uint32_t bootloaderBoardID) QHash* prgFirmware = _firmwareHashForBoardId(static_cast(bootloaderBoardID)); - foreach (FirmwareIdentifier firmwareId, prgFirmware->keys()) { + for (FirmwareIdentifier firmwareId: prgFirmware->keys()) { if (firmwareId.autopilotStackType == AutoPilotStackAPM) { QString versionFile = QFileInfo(prgFirmware->value(firmwareId)).path() + "/git-version.txt"; @@ -733,7 +733,7 @@ void FirmwareUpgradeController::_apmVersionDownloadFinished(QString remoteFile, QHash* prgFirmware = _firmwareHashForBoardId(static_cast(_bootloaderBoardID)); QString remotePath = QFileInfo(remoteFile).path(); - foreach (FirmwareIdentifier firmwareId, prgFirmware->keys()) { + for (FirmwareIdentifier firmwareId: prgFirmware->keys()) { if (remotePath == QFileInfo((*prgFirmware)[firmwareId]).path()) { qCDebug(FirmwareUpgradeLog) << "Adding version to map, version:firwmareType:vehicleType" << version << firmwareId.firmwareType << firmwareId.firmwareVehicleType; _apmVersionMap[firmwareId.firmwareType][firmwareId.firmwareVehicleType] = version; @@ -761,7 +761,7 @@ QStringList FirmwareUpgradeController::apmAvailableVersions(void) _apmVehicleTypeFromCurrentVersionList.clear(); - foreach (FirmwareVehicleType_t vehicleType, vehicleTypes) { + for (FirmwareVehicleType_t vehicleType: vehicleTypes) { if (_apmVersionMap[_selectedFirmwareType].contains(vehicleType)) { QString version; diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc index d2ee548ba..5cfcf8dac 100644 --- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc +++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc @@ -119,7 +119,7 @@ void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void) bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QGCSerialPortInfo& portInfo, QGCSerialPortInfo::BoardType_t& boardType, QString& boardName) { - foreach (QGCSerialPortInfo info, QGCSerialPortInfo::availablePorts()) { + for (QGCSerialPortInfo info: QGCSerialPortInfo::availablePorts()) { info.getBoardInfo(boardType, boardName); qCDebug(FirmwareUpgradeVerboseLog) << "Serial Port --------------"; diff --git a/src/VehicleSetup/VehicleComponent.cc b/src/VehicleSetup/VehicleComponent.cc index 071940bc0..3e5f3e310 100644 --- a/src/VehicleSetup/VehicleComponent.cc +++ b/src/VehicleSetup/VehicleComponent.cc @@ -54,7 +54,7 @@ void VehicleComponent::addSummaryQmlComponent(QQmlContext* context, QQuickItem* void VehicleComponent::setupTriggerSignals(void) { // Watch for changed on trigger list params - foreach (const QString ¶mName, setupCompleteChangedTriggerList()) { + for (const QString ¶mName: setupCompleteChangedTriggerList()) { if (_vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, paramName)) { Fact* fact = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, paramName); connect(fact, &Fact::valueChanged, this, &VehicleComponent::_triggerUpdated); -- 2.22.0