Commit 583da803 authored by Patrick José Pereira's avatar Patrick José Pereira

Camera: Change from foreach to c++11 for

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent 7e3cf7c7
...@@ -917,7 +917,7 @@ void ...@@ -917,7 +917,7 @@ void
QGCCameraControl::_requestAllParameters() QGCCameraControl::_requestAllParameters()
{ {
//-- Reset receive list //-- Reset receive list
foreach(QString paramName, _paramIO.keys()) { for(QString paramName: _paramIO.keys()) {
if(_paramIO[paramName]) { if(_paramIO[paramName]) {
_paramIO[paramName]->setParamRequest(); _paramIO[paramName]->setParamRequest();
} else { } else {
...@@ -984,7 +984,7 @@ QGCCameraControl::_updateActiveList() ...@@ -984,7 +984,7 @@ QGCCameraControl::_updateActiveList()
{ {
//-- Clear out excluded parameters based on exclusion rules //-- Clear out excluded parameters based on exclusion rules
QStringList exclusionList; QStringList exclusionList;
foreach(QGCCameraOptionExclusion* param, _valueExclusions) { for(QGCCameraOptionExclusion* param: _valueExclusions) {
Fact* pFact = getFact(param->param); Fact* pFact = getFact(param->param);
if(pFact) { if(pFact) {
QString option = pFact->rawValueString(); QString option = pFact->rawValueString();
...@@ -994,7 +994,7 @@ QGCCameraControl::_updateActiveList() ...@@ -994,7 +994,7 @@ QGCCameraControl::_updateActiveList()
} }
} }
QStringList active; QStringList active;
foreach(QString key, _settings) { for(QString key: _settings) {
if(!exclusionList.contains(key)) { if(!exclusionList.contains(key)) {
active.append(key); active.append(key);
} }
...@@ -1094,7 +1094,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1094,7 +1094,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
QStringList resetList; QStringList resetList;
QStringList updates; QStringList updates;
//-- Iterate range sets looking for limited ranges //-- Iterate range sets looking for limited ranges
foreach(QGCCameraOptionRange* pRange, _optionRanges) { for(QGCCameraOptionRange* pRange: _optionRanges) {
//-- If this fact or one of its conditions is part of this range set //-- If this fact or one of its conditions is part of this range set
if(!changedList.contains(pRange->targetParam) && (pRange->param == pFact->name() || pRange->condition.contains(pFact->name()))) { if(!changedList.contains(pRange->targetParam) && (pRange->param == pFact->name() || pRange->condition.contains(pFact->name()))) {
Fact* pRFact = getFact(pRange->param); //-- This parameter Fact* pRFact = getFact(pRange->param); //-- This parameter
...@@ -1115,7 +1115,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1115,7 +1115,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
} }
} }
//-- Iterate range sets again looking for resets //-- Iterate range sets again looking for resets
foreach(QGCCameraOptionRange* pRange, _optionRanges) { for(QGCCameraOptionRange* pRange: _optionRanges) {
if(!changedList.contains(pRange->targetParam) && (pRange->param == pFact->name() || pRange->condition.contains(pFact->name()))) { if(!changedList.contains(pRange->targetParam) && (pRange->param == pFact->name() || pRange->condition.contains(pFact->name()))) {
Fact* pTFact = getFact(pRange->targetParam); //-- The target parameter (the one its range is to change) Fact* pTFact = getFact(pRange->targetParam); //-- The target parameter (the one its range is to change)
if(!resetList.contains(pRange->targetParam)) { if(!resetList.contains(pRange->targetParam)) {
...@@ -1128,7 +1128,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1128,7 +1128,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
} }
} }
//-- Update limited range set //-- Update limited range set
foreach (Fact* f, rangesSet.keys()) { for (Fact* f: rangesSet.keys()) {
f->setEnumInfo(rangesSet[f]->optNames, rangesSet[f]->optVariants); f->setEnumInfo(rangesSet[f]->optNames, rangesSet[f]->optVariants);
if(!updates.contains(f->name())) { if(!updates.contains(f->name())) {
_paramIO[f->name()]->optNames = rangesSet[f]->optNames; _paramIO[f->name()]->optNames = rangesSet[f]->optNames;
...@@ -1139,7 +1139,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1139,7 +1139,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
} }
} }
//-- Restore full range set //-- Restore full range set
foreach (Fact* f, rangesReset.keys()) { for (Fact* f: rangesReset.keys()) {
f->setEnumInfo(_originalOptNames[rangesReset[f]], _originalOptValues[rangesReset[f]]); f->setEnumInfo(_originalOptNames[rangesReset[f]], _originalOptValues[rangesReset[f]]);
if(!updates.contains(f->name())) { if(!updates.contains(f->name())) {
_paramIO[f->name()]->optNames = _originalOptNames[rangesReset[f]]; _paramIO[f->name()]->optNames = _originalOptNames[rangesReset[f]];
...@@ -1151,7 +1151,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1151,7 +1151,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
} }
//-- Parameter update requests //-- Parameter update requests
if(_requestUpdates.contains(pFact->name())) { if(_requestUpdates.contains(pFact->name())) {
foreach(QString param, _requestUpdates[pFact->name()]) { for(QString param: _requestUpdates[pFact->name()]) {
if(!_updatesToRequest.contains(param)) { if(!_updatesToRequest.contains(param)) {
_updatesToRequest << param; _updatesToRequest << param;
} }
...@@ -1166,7 +1166,7 @@ QGCCameraControl::_updateRanges(Fact* pFact) ...@@ -1166,7 +1166,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
void void
QGCCameraControl::_requestParamUpdates() QGCCameraControl::_requestParamUpdates()
{ {
foreach(QString param, _updatesToRequest) { for(QString param: _updatesToRequest) {
_paramIO[param]->paramRequest(); _paramIO[param]->paramRequest();
} }
_updatesToRequest.clear(); _updatesToRequest.clear();
...@@ -1358,7 +1358,7 @@ void ...@@ -1358,7 +1358,7 @@ void
QGCCameraControl::_processRanges() QGCCameraControl::_processRanges()
{ {
//-- After all parameter are loaded, process parameter ranges //-- After all parameter are loaded, process parameter ranges
foreach(QGCCameraOptionRange* pRange, _optionRanges) { for(QGCCameraOptionRange* pRange: _optionRanges) {
Fact* pRFact = getFact(pRange->targetParam); Fact* pRFact = getFact(pRange->targetParam);
if(pRFact) { if(pRFact) {
for(int i = 0; i < pRange->optNames.size(); i++) { for(int i = 0; i < pRange->optNames.size(); i++) {
...@@ -1488,7 +1488,7 @@ QGCCameraControl::_dataReady(QByteArray data) ...@@ -1488,7 +1488,7 @@ QGCCameraControl::_dataReady(QByteArray data)
void void
QGCCameraControl::_paramDone() QGCCameraControl::_paramDone()
{ {
foreach(QString param, _paramIO.keys()) { for(QString param: _paramIO.keys()) {
if(!_paramIO[param]->paramDone()) { if(!_paramIO[param]->paramDone()) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment