Commit df569bcf authored by Patrick José Pereira's avatar Patrick José Pereira

FactSystem: Change from foreach to c++11 for

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent 583da803
...@@ -221,7 +221,7 @@ int Fact::enumIndex(void) ...@@ -221,7 +221,7 @@ int Fact::enumIndex(void)
//-- Only enums have an index //-- Only enums have an index
if(_metaData->enumValues().count()) { if(_metaData->enumValues().count()) {
int index = 0; int index = 0;
foreach (QVariant enumValue, _metaData->enumValues()) { for (QVariant enumValue: _metaData->enumValues()) {
if (enumValue == rawValue()) { if (enumValue == rawValue()) {
return index; return index;
} }
......
...@@ -120,7 +120,7 @@ void FactGroup::_addFactGroup(FactGroup* factGroup, const QString& name) ...@@ -120,7 +120,7 @@ void FactGroup::_addFactGroup(FactGroup* factGroup, const QString& name)
void FactGroup::_updateAllValues(void) void FactGroup::_updateAllValues(void)
{ {
foreach(Fact* fact, _nameToFactMap) { for(Fact* fact: _nameToFactMap) {
fact->sendDeferredValueChangedSignal(); fact->sendDeferredValueChangedSignal();
} }
} }
...@@ -228,21 +228,21 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString ...@@ -228,21 +228,21 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
int waitingReadParamNameCount = 0; int waitingReadParamNameCount = 0;
int waitingWriteParamNameCount = 0; int waitingWriteParamNameCount = 0;
foreach(int waitingComponentId, _waitingReadParamIndexMap.keys()) { for(int waitingComponentId: _waitingReadParamIndexMap.keys()) {
waitingReadParamIndexCount += _waitingReadParamIndexMap[waitingComponentId].count(); waitingReadParamIndexCount += _waitingReadParamIndexMap[waitingComponentId].count();
} }
if (waitingReadParamIndexCount) { if (waitingReadParamIndexCount) {
qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamIndexCount:" << waitingReadParamIndexCount; qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamIndexCount:" << waitingReadParamIndexCount;
} }
foreach(int waitingComponentId, _waitingReadParamNameMap.keys()) { for(int waitingComponentId: _waitingReadParamNameMap.keys()) {
waitingReadParamNameCount += _waitingReadParamNameMap[waitingComponentId].count(); waitingReadParamNameCount += _waitingReadParamNameMap[waitingComponentId].count();
} }
if (waitingReadParamNameCount) { if (waitingReadParamNameCount) {
qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamNameCount:" << waitingReadParamNameCount; qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamNameCount:" << waitingReadParamNameCount;
} }
foreach(int waitingComponentId, _waitingWriteParamNameMap.keys()) { for(int waitingComponentId: _waitingWriteParamNameMap.keys()) {
waitingWriteParamNameCount += _waitingWriteParamNameMap[waitingComponentId].count(); waitingWriteParamNameCount += _waitingWriteParamNameMap[waitingComponentId].count();
} }
if (waitingWriteParamNameCount) { if (waitingWriteParamNameCount) {
...@@ -418,7 +418,7 @@ void ParameterManager::refreshAllParameters(uint8_t componentId) ...@@ -418,7 +418,7 @@ void ParameterManager::refreshAllParameters(uint8_t componentId)
} }
// Reset index wait lists // Reset index wait lists
foreach (int cid, _paramCountMap.keys()) { for (int cid: _paramCountMap.keys()) {
// Add/Update all indices to the wait list, parameter index is 0-based // Add/Update all indices to the wait list, parameter index is 0-based
if(componentId != MAV_COMP_ID_ALL && componentId != cid) if(componentId != MAV_COMP_ID_ALL && componentId != cid)
continue; continue;
...@@ -486,7 +486,7 @@ void ParameterManager::refreshParametersPrefix(int componentId, const QString& n ...@@ -486,7 +486,7 @@ void ParameterManager::refreshParametersPrefix(int componentId, const QString& n
componentId = _actualComponentId(componentId); componentId = _actualComponentId(componentId);
qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "refreshParametersPrefix - name:" << namePrefix << ")"; qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "refreshParametersPrefix - name:" << namePrefix << ")";
foreach(const QString &name, _mapParameterName2Variant[componentId].keys()) { for(const QString &name: _mapParameterName2Variant[componentId].keys()) {
if (name.startsWith(namePrefix)) { if (name.startsWith(namePrefix)) {
refreshParameter(componentId, name); refreshParameter(componentId, name);
} }
...@@ -522,7 +522,7 @@ QStringList ParameterManager::parameterNames(int componentId) ...@@ -522,7 +522,7 @@ QStringList ParameterManager::parameterNames(int componentId)
{ {
QStringList names; QStringList names;
foreach(const QString &paramName, _mapParameterName2Variant[_actualComponentId(componentId)].keys()) { for(const QString &paramName: _mapParameterName2Variant[_actualComponentId(componentId)].keys()) {
names << paramName; names << paramName;
} }
...@@ -534,7 +534,7 @@ void ParameterManager::_setupCategoryMap(void) ...@@ -534,7 +534,7 @@ void ParameterManager::_setupCategoryMap(void)
// Must be able to handle being called multiple times // Must be able to handle being called multiple times
_categoryMap.clear(); _categoryMap.clear();
foreach (const QString &name, _mapParameterName2Variant[_vehicle->defaultComponentId()].keys()) { for (const QString &name: _mapParameterName2Variant[_vehicle->defaultComponentId()].keys()) {
Fact* fact = _mapParameterName2Variant[_vehicle->defaultComponentId()][name].value<Fact*>(); Fact* fact = _mapParameterName2Variant[_vehicle->defaultComponentId()][name].value<Fact*>();
_categoryMap[fact->category()][fact->group()] += name; _categoryMap[fact->category()][fact->group()] += name;
} }
...@@ -564,13 +564,13 @@ bool ParameterManager::_fillIndexBatchQueue(bool waitingParamTimeout) ...@@ -564,13 +564,13 @@ bool ParameterManager::_fillIndexBatchQueue(bool waitingParamTimeout)
qCDebug(ParameterManagerLog) << "Refilling index based batch queue due to received parameter"; qCDebug(ParameterManagerLog) << "Refilling index based batch queue due to received parameter";
} }
foreach(int componentId, _waitingReadParamIndexMap.keys()) { for(int componentId: _waitingReadParamIndexMap.keys()) {
if (_waitingReadParamIndexMap[componentId].count()) { if (_waitingReadParamIndexMap[componentId].count()) {
qCDebug(ParameterManagerLog) << _logVehiclePrefix() << "_waitingReadParamIndexMap count" << _waitingReadParamIndexMap[componentId].count(); qCDebug(ParameterManagerLog) << _logVehiclePrefix() << "_waitingReadParamIndexMap count" << _waitingReadParamIndexMap[componentId].count();
qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix() << "_waitingReadParamIndexMap" << _waitingReadParamIndexMap[componentId]; qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix() << "_waitingReadParamIndexMap" << _waitingReadParamIndexMap[componentId];
} }
foreach(int paramIndex, _waitingReadParamIndexMap[componentId].keys()) { for(int paramIndex: _waitingReadParamIndexMap[componentId].keys()) {
if (_indexBatchQueue.contains(paramIndex)) { if (_indexBatchQueue.contains(paramIndex)) {
// Don't add more than once // Don't add more than once
continue; continue;
...@@ -629,8 +629,8 @@ void ParameterManager::_waitingParamTimeout(void) ...@@ -629,8 +629,8 @@ void ParameterManager::_waitingParamTimeout(void)
_checkInitialLoadComplete(); _checkInitialLoadComplete();
if (!paramsRequested) { if (!paramsRequested) {
foreach(int componentId, _waitingWriteParamNameMap.keys()) { for(int componentId: _waitingWriteParamNameMap.keys()) {
foreach(const QString &paramName, _waitingWriteParamNameMap[componentId].keys()) { for(const QString &paramName: _waitingWriteParamNameMap[componentId].keys()) {
paramsRequested = true; paramsRequested = true;
_waitingWriteParamNameMap[componentId][paramName]++; // Bump retry count _waitingWriteParamNameMap[componentId][paramName]++; // Bump retry count
if (_waitingWriteParamNameMap[componentId][paramName] <= _maxReadWriteRetry) { if (_waitingWriteParamNameMap[componentId][paramName] <= _maxReadWriteRetry) {
...@@ -651,8 +651,8 @@ void ParameterManager::_waitingParamTimeout(void) ...@@ -651,8 +651,8 @@ void ParameterManager::_waitingParamTimeout(void)
} }
if (!paramsRequested) { if (!paramsRequested) {
foreach(int componentId, _waitingReadParamNameMap.keys()) { for(int componentId: _waitingReadParamNameMap.keys()) {
foreach(const QString &paramName, _waitingReadParamNameMap[componentId].keys()) { for(const QString &paramName: _waitingReadParamNameMap[componentId].keys()) {
paramsRequested = true; paramsRequested = true;
_waitingReadParamNameMap[componentId][paramName]++; // Bump retry count _waitingReadParamNameMap[componentId][paramName]++; // Bump retry count
if (_waitingReadParamNameMap[componentId][paramName] <= _maxReadWriteRetry) { if (_waitingReadParamNameMap[componentId][paramName] <= _maxReadWriteRetry) {
...@@ -759,7 +759,7 @@ void ParameterManager::_writeLocalParamCache(int vehicleId, int componentId) ...@@ -759,7 +759,7 @@ void ParameterManager::_writeLocalParamCache(int vehicleId, int componentId)
{ {
CacheMapName2ParamTypeVal cacheMap; CacheMapName2ParamTypeVal cacheMap;
foreach(const QString& name, _mapParameterName2Variant[componentId].keys()) { for(const QString& name: _mapParameterName2Variant[componentId].keys()) {
const Fact *fact = _mapParameterName2Variant[componentId][name].value<Fact*>(); const Fact *fact = _mapParameterName2Variant[componentId][name].value<Fact*>();
cacheMap[name] = ParamTypeVal(fact->type(), fact->rawValue()); cacheMap[name] = ParamTypeVal(fact->type(), fact->rawValue());
} }
...@@ -810,7 +810,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian ...@@ -810,7 +810,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian
/* compute the crc of the local cache to check against the remote */ /* compute the crc of the local cache to check against the remote */
FirmwarePlugin* firmwarePlugin = _vehicle->firmwarePlugin(); FirmwarePlugin* firmwarePlugin = _vehicle->firmwarePlugin();
foreach (const QString& name, cacheMap.keys()) { for (const QString& name: cacheMap.keys()) {
bool volatileValue = false; bool volatileValue = false;
FactMetaData* metaData = firmwarePlugin->getMetaDataForFact(_parameterMetaData, name, _vehicle->vehicleType()); FactMetaData* metaData = firmwarePlugin->getMetaDataForFact(_parameterMetaData, name, _vehicle->vehicleType());
...@@ -836,7 +836,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian ...@@ -836,7 +836,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian
int count = cacheMap.count(); int count = cacheMap.count();
int index = 0; int index = 0;
foreach (const QString& name, cacheMap.keys()) { for (const QString& name: cacheMap.keys()) {
const ParamTypeVal& paramTypeVal = cacheMap[name]; const ParamTypeVal& paramTypeVal = cacheMap[name];
const FactMetaData::ValueType_t fact_type = static_cast<FactMetaData::ValueType_t>(paramTypeVal.first); const FactMetaData::ValueType_t fact_type = static_cast<FactMetaData::ValueType_t>(paramTypeVal.first);
const int mavType = _factTypeToMavType(fact_type); const int mavType = _factTypeToMavType(fact_type);
...@@ -888,7 +888,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian ...@@ -888,7 +888,7 @@ void ParameterManager::_tryCacheHashLoad(int vehicleId, int componentId, QVarian
if (ParameterManagerDebugCacheFailureLog().isDebugEnabled()) { if (ParameterManagerDebugCacheFailureLog().isDebugEnabled()) {
_debugCacheCRC[componentId] = true; _debugCacheCRC[componentId] = true;
_debugCacheMap[componentId] = cacheMap; _debugCacheMap[componentId] = cacheMap;
foreach (const QString& name, cacheMap.keys()) { for (const QString& name: cacheMap.keys()) {
_debugCacheParamSeen[componentId][name] = false; _debugCacheParamSeen[componentId][name] = false;
} }
qgcApp()->showMessage(tr("Parameter cache CRC match failed")); qgcApp()->showMessage(tr("Parameter cache CRC match failed"));
...@@ -958,8 +958,8 @@ void ParameterManager::writeParametersToStream(QTextStream &stream) ...@@ -958,8 +958,8 @@ void ParameterManager::writeParametersToStream(QTextStream &stream)
stream << "#\n"; stream << "#\n";
stream << "# Vehicle-Id Component-Id Name Value Type\n"; stream << "# Vehicle-Id Component-Id Name Value Type\n";
foreach (int componentId, _mapParameterName2Variant.keys()) { for (int componentId: _mapParameterName2Variant.keys()) {
foreach (const QString &paramName, _mapParameterName2Variant[componentId].keys()) { for (const QString &paramName: _mapParameterName2Variant[componentId].keys()) {
Fact* fact = _mapParameterName2Variant[componentId][paramName].value<Fact*>(); Fact* fact = _mapParameterName2Variant[componentId][paramName].value<Fact*>();
if (fact) { if (fact) {
stream << _vehicle->id() << "\t" << componentId << "\t" << paramName << "\t" << fact->rawValueStringFullPrecision() << "\t" << QString("%1").arg(_factTypeToMavType(fact->type())) << "\n"; stream << _vehicle->id() << "\t" << componentId << "\t" << paramName << "\t" << fact->rawValueStringFullPrecision() << "\t" << QString("%1").arg(_factTypeToMavType(fact->type())) << "\n";
...@@ -1084,7 +1084,7 @@ void ParameterManager::_addMetaDataToDefaultComponent(void) ...@@ -1084,7 +1084,7 @@ void ParameterManager::_addMetaDataToDefaultComponent(void)
// Loop over all parameters in default component adding meta data // Loop over all parameters in default component adding meta data
QVariantMap& factMap = _mapParameterName2Variant[_vehicle->defaultComponentId()]; QVariantMap& factMap = _mapParameterName2Variant[_vehicle->defaultComponentId()];
foreach (const QString& key, factMap.keys()) { for (const QString& key: factMap.keys()) {
_vehicle->firmwarePlugin()->addMetaDataToFact(_parameterMetaData, factMap[key].value<Fact*>(), _vehicle->vehicleType()); _vehicle->firmwarePlugin()->addMetaDataToFact(_parameterMetaData, factMap[key].value<Fact*>(), _vehicle->vehicleType());
} }
} }
...@@ -1096,7 +1096,7 @@ void ParameterManager::_checkInitialLoadComplete(void) ...@@ -1096,7 +1096,7 @@ void ParameterManager::_checkInitialLoadComplete(void)
return; return;
} }
foreach (int componentId, _waitingReadParamIndexMap.keys()) { for (int componentId: _waitingReadParamIndexMap.keys()) {
if (_waitingReadParamIndexMap[componentId].count()) { if (_waitingReadParamIndexMap[componentId].count()) {
// We are still waiting on some parameters, not done yet // We are still waiting on some parameters, not done yet
return; return;
...@@ -1112,9 +1112,9 @@ void ParameterManager::_checkInitialLoadComplete(void) ...@@ -1112,9 +1112,9 @@ void ParameterManager::_checkInitialLoadComplete(void)
_initialLoadComplete = true; _initialLoadComplete = true;
// Parameter cache crc failure debugging // Parameter cache crc failure debugging
foreach (int componentId, _debugCacheParamSeen.keys()) { for (int componentId: _debugCacheParamSeen.keys()) {
if (!_logReplay && _debugCacheCRC.contains(componentId) && _debugCacheCRC[componentId]) { if (!_logReplay && _debugCacheCRC.contains(componentId) && _debugCacheCRC[componentId]) {
foreach (const QString& paramName, _debugCacheParamSeen[componentId].keys()) { for (const QString& paramName: _debugCacheParamSeen[componentId].keys()) {
if (!_debugCacheParamSeen[componentId][paramName]) { if (!_debugCacheParamSeen[componentId][paramName]) {
qDebug() << "Parameter in cache but not on vehicle componentId:Name" << componentId << paramName; qDebug() << "Parameter in cache but not on vehicle componentId:Name" << componentId << paramName;
} }
...@@ -1128,8 +1128,8 @@ void ParameterManager::_checkInitialLoadComplete(void) ...@@ -1128,8 +1128,8 @@ void ParameterManager::_checkInitialLoadComplete(void)
// Check for index based load failures // Check for index based load failures
QString indexList; QString indexList;
bool initialLoadFailures = false; bool initialLoadFailures = false;
foreach (int componentId, _failedReadParamIndexMap.keys()) { for (int componentId: _failedReadParamIndexMap.keys()) {
foreach (int paramIndex, _failedReadParamIndexMap[componentId]) { for (int paramIndex: _failedReadParamIndexMap[componentId]) {
if (initialLoadFailures) { if (initialLoadFailures) {
indexList += ", "; indexList += ", ";
} }
......
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