Merge pull request #3217 from gberkes/v3/sonarcloud_Replace_this_declaration_by_a_structured_binding_declaration

V3/sonarcloud replace this declaration by a structured binding declaration
This commit is contained in:
Ervin Hegedus
2024-08-08 17:55:09 +02:00
committed by GitHub

View File

@@ -133,45 +133,33 @@ bool RuleWithOperator::executeOperatorAt(Transaction *trans, const std::string &
void RuleWithOperator::getVariablesExceptions(Transaction *t, void RuleWithOperator::getVariablesExceptions(Transaction *t,
variables::Variables *exclusion, variables::Variables *addition) { variables::Variables *exclusion, variables::Variables *addition) {
for (const auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_tag) { // cppcheck-suppress ctunullpointer for (const auto &[tag, v] : t->m_rules->m_exceptions.m_variable_update_target_by_tag) { // cppcheck-suppress ctunullpointer
if (containsTag(*a.first.get(), t) == false) { if (containsTag(*tag.get(), t)) {
continue; if (Variable *b{v.get()};dynamic_cast<variables::VariableModificatorExclusion*>(b)) {
} exclusion->push_back(dynamic_cast<variables::VariableModificatorExclusion*>(b)->m_base.get());
Variable *b = a.second.get(); } else {
if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) { addition->push_back(b);
exclusion->push_back( }
dynamic_cast<variables::VariableModificatorExclusion*>(
b)->m_base.get());
} else {
addition->push_back(b);
} }
} }
for (const auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_msg) { for (const auto &[msg, v] : t->m_rules->m_exceptions.m_variable_update_target_by_msg) {
if (containsMsg(*a.first.get(), t) == false) { if (containsMsg(*msg.get(), t)) {
continue; if (Variable *b{v.get()}; dynamic_cast<variables::VariableModificatorExclusion *>(b)) {
} exclusion->push_back(dynamic_cast<variables::VariableModificatorExclusion *>(b)->m_base.get());
Variable *b = a.second.get(); } else {
if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) { addition->push_back(b);
exclusion->push_back( }
dynamic_cast<variables::VariableModificatorExclusion*>(
b)->m_base.get());
} else {
addition->push_back(b);
} }
} }
for (const auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_id) { for (const auto &[id, v] : t->m_rules->m_exceptions.m_variable_update_target_by_id) { // cppcheck-suppress unassignedVariable
if (m_ruleId != a.first) { if (m_ruleId == id) {
continue; if (Variable *b{v.get()};dynamic_cast<variables::VariableModificatorExclusion *>(b)) {
} exclusion->push_back(dynamic_cast<variables::VariableModificatorExclusion *>(b)->m_base.get());
Variable *b = a.second.get(); } else {
if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) { addition->push_back(b);
exclusion->push_back( }
dynamic_cast<variables::VariableModificatorExclusion*>(
b)->m_base.get());
} else {
addition->push_back(b);
} }
} }
} }