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
QGCCameraControl::_requestAllParameters()
{
//-- Reset receive list
foreach(QString paramName, _paramIO.keys()) {
for(QString paramName: _paramIO.keys()) {
if(_paramIO[paramName]) {
_paramIO[paramName]->setParamRequest();
} else {
......@@ -984,7 +984,7 @@ QGCCameraControl::_updateActiveList()
{
//-- Clear out excluded parameters based on exclusion rules
QStringList exclusionList;
foreach(QGCCameraOptionExclusion* param, _valueExclusions) {
for(QGCCameraOptionExclusion* param: _valueExclusions) {
Fact* pFact = getFact(param->param);
if(pFact) {
QString option = pFact->rawValueString();
......@@ -994,7 +994,7 @@ QGCCameraControl::_updateActiveList()
}
}
QStringList active;
foreach(QString key, _settings) {
for(QString key: _settings) {
if(!exclusionList.contains(key)) {
active.append(key);
}
......@@ -1094,7 +1094,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
QStringList resetList;
QStringList updates;
//-- 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(!changedList.contains(pRange->targetParam) && (pRange->param == pFact->name() || pRange->condition.contains(pFact->name()))) {
Fact* pRFact = getFact(pRange->param); //-- This parameter
......@@ -1115,7 +1115,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- 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()))) {
Fact* pTFact = getFact(pRange->targetParam); //-- The target parameter (the one its range is to change)
if(!resetList.contains(pRange->targetParam)) {
......@@ -1128,7 +1128,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- Update limited range set
foreach (Fact* f, rangesSet.keys()) {
for (Fact* f: rangesSet.keys()) {
f->setEnumInfo(rangesSet[f]->optNames, rangesSet[f]->optVariants);
if(!updates.contains(f->name())) {
_paramIO[f->name()]->optNames = rangesSet[f]->optNames;
......@@ -1139,7 +1139,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- Restore full range set
foreach (Fact* f, rangesReset.keys()) {
for (Fact* f: rangesReset.keys()) {
f->setEnumInfo(_originalOptNames[rangesReset[f]], _originalOptValues[rangesReset[f]]);
if(!updates.contains(f->name())) {
_paramIO[f->name()]->optNames = _originalOptNames[rangesReset[f]];
......@@ -1151,7 +1151,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
//-- Parameter update requests
if(_requestUpdates.contains(pFact->name())) {
foreach(QString param, _requestUpdates[pFact->name()]) {
for(QString param: _requestUpdates[pFact->name()]) {
if(!_updatesToRequest.contains(param)) {
_updatesToRequest << param;
}
......@@ -1166,7 +1166,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
void
QGCCameraControl::_requestParamUpdates()
{
foreach(QString param, _updatesToRequest) {
for(QString param: _updatesToRequest) {
_paramIO[param]->paramRequest();
}
_updatesToRequest.clear();
......@@ -1358,7 +1358,7 @@ void
QGCCameraControl::_processRanges()
{
//-- After all parameter are loaded, process parameter ranges
foreach(QGCCameraOptionRange* pRange, _optionRanges) {
for(QGCCameraOptionRange* pRange: _optionRanges) {
Fact* pRFact = getFact(pRange->targetParam);
if(pRFact) {
for(int i = 0; i < pRange->optNames.size(); i++) {
......@@ -1488,7 +1488,7 @@ QGCCameraControl::_dataReady(QByteArray data)
void
QGCCameraControl::_paramDone()
{
foreach(QString param, _paramIO.keys()) {
for(QString param: _paramIO.keys()) {
if(!_paramIO[param]->paramDone()) {
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