Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 21:34:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trim else after return

Browse source
This commit is contained in:
sabrina-shanman 2019-08-26 14:30:47 -07:00
parent 388a70502e
commit ad1a98b85a
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
tools/nitpick/src/TestCreator.cpp
View file

@ -544,34 +544,34 @@ TestFilter::TestFilter(const QString& filterString) {
if (foundCategoryIt == propertyToProfileCategory.cend()) { if (foundCategoryIt == propertyToProfileCategory.cend()) {
error = "Invalid test filter property '" + referenceVariant + "'"; error = "Invalid test filter property '" + referenceVariant + "'";
return; return;
} else { }
ProfileCategory selectedFilterCategory = foundCategoryIt->second;
for (auto allowedVariantIt = ++(allowedVariants.cbegin()); allowedVariantIt != allowedVariants.cend(); ++allowedVariantIt) {
auto& currentVariant = *allowedVariantIt;
auto nextCategoryIt = propertyToProfileCategory.find(currentVariant);
if (nextCategoryIt == propertyToProfileCategory.cend()) {
error = "Invalid test filter property '" + referenceVariant + "'";
return;
}
auto& currentCategory = nextCategoryIt->second;
if (currentCategory != selectedFilterCategory) {
error = "Mismatched comma-separated test filter properties '" + referenceVariant + "' and '" + currentVariant + "'";
return;
}
// List of comma-separated test property variants is consistent so far
}
switch (selectedFilterCategory) { ProfileCategory selectedFilterCategory = foundCategoryIt->second;
case ProfileCategory::TIER: for (auto allowedVariantIt = ++(allowedVariants.cbegin()); allowedVariantIt != allowedVariants.cend(); ++allowedVariantIt) {
allowedTiers.insert(allowedTiers.cend(), allowedVariants.cbegin(), allowedVariants.cend()); auto& currentVariant = *allowedVariantIt;
break; auto nextCategoryIt = propertyToProfileCategory.find(currentVariant);
case ProfileCategory::OS: if (nextCategoryIt == propertyToProfileCategory.cend()) {
allowedOperatingSystems.insert(allowedOperatingSystems.cend(), allowedVariants.cbegin(), allowedVariants.cend()); error = "Invalid test filter property '" + referenceVariant + "'";
break; return;
case ProfileCategory::GPU:
allowedGPUs.insert(allowedGPUs.cend(), allowedVariants.cbegin(), allowedVariants.cend());
break;
} }
auto& currentCategory = nextCategoryIt->second;
if (currentCategory != selectedFilterCategory) {
error = "Mismatched comma-separated test filter properties '" + referenceVariant + "' and '" + currentVariant + "'";
return;
}
// List of comma-separated test property variants is consistent so far
}
switch (selectedFilterCategory) {
case ProfileCategory::TIER:
allowedTiers.insert(allowedTiers.cend(), allowedVariants.cbegin(), allowedVariants.cend());
break;
case ProfileCategory::OS:
allowedOperatingSystems.insert(allowedOperatingSystems.cend(), allowedVariants.cbegin(), allowedVariants.cend());
break;
case ProfileCategory::GPU:
allowedGPUs.insert(allowedGPUs.cend(), allowedVariants.cbegin(), allowedVariants.cend());
break;
} }
} }
} }