eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 13:19:20 +02:00
Code Issues 150 Wiki Activity

refactor(sonar): use structured bindings for pair access (cpp:S6005)

Browse Source
This commit is contained in:
jerrrrycho
2026-10-10 16:06:32 +02:00
parent 71b338f30e
commit 560512bd9e
18 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripting/ladderlogic.cpp
View File

@@ -154,8 +154,8 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool {
}
if( false == operationparameter.empty() ) {
auto const parameter{ split_string_and_number( operationparameter ) };
operation.parameter1 = static_cast<short>( parameter.second );
auto const [parametertype, parameterindex]{ split_string_and_number( operationparameter ) };
operation.parameter1 = static_cast<short>( parameterindex );
}
m_program.emplace_back( operation );
@@ -380,12 +380,12 @@ basic_controller::log_error( std::string const &Error, int const Line ) const {
auto
basic_controller::guess_element_type_from_name( std::string const &Name ) const -> basic_element::type_e {
auto const name { split_string_and_number( Name ) };
auto const [nametype, nameindex]{ split_string_and_number( Name ) };
if( name.first == "t" || name.first == "ton" || name.first.find("timer.") == 0 ) {
if( nametype == "t" || nametype == "ton" || nametype.find("timer.") == 0 ) {
return basic_element::type_e::timer;
}
if( name.first == "c" || name.first.find("counter.") == 0 ) {
if( nametype == "c" || nametype.find("counter.") == 0 ) {
return basic_element::type_e::counter;
}