From 2afa42c6b74f936630ef05b37aea004db27bebd7 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 10 Oct 2026 17:28:41 +0200 Subject: [PATCH] refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). --- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 4 ++-- application/uitranscripts.cpp | 2 +- application/uitranscripts.h | 2 +- gl/shader.cpp | 2 +- scripting/ladderlogic.cpp | 2 +- scripting/ladderlogic.h | 2 +- world/MemCell.cpp | 2 +- world/MemCell.h | 2 +- world/mtable.cpp | 4 ++-- world/mtable.h | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 8e271997..6f1d7957 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2518,7 +2518,7 @@ class TMoverParameters /* funckje dla wagonow*/ bool AssignLoad(std::string const &Name, float const Amount = 0.f); - bool LoadingDone(double LSpeed, std::string const &Loadname); + bool LoadingDone(double LSpeed, std::string_view Loadname); bool PermitDoors(side const Door, bool const State = true, range_t const Notify = range_t::consist); void PermitDoors_(side const Door, bool const State = true); bool ChangeDoorPermitPreset(int const Change, range_t const Notify = range_t::consist); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e7fe3274..251c0f70 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8454,7 +8454,7 @@ bool TMoverParameters::AssignLoad(std::string const &Loadname, float const Amoun // Q: 20160713 // Test zakończenia załadunku / rozładunku // ************************************************************************************************* -bool TMoverParameters::LoadingDone(double const LSpeed, std::string const &Loadname) +bool TMoverParameters::LoadingDone(double const LSpeed, std::string_view Loadname) { if (LSpeed == 0.0) @@ -9005,7 +9005,7 @@ bool startLIGHTSLIST; bool startCOMPRESSORLIST; int LISTLINE; -bool issection(std::string const &Name, std::string const &Input) +bool issection(std::string_view Name, std::string_view Input) { return Input.compare(0, Name.size(), Name) == 0; diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp index 5a65ff68..7ce36053 100644 --- a/application/uitranscripts.cpp +++ b/application/uitranscripts.cpp @@ -11,7 +11,7 @@ TTranscripts Transcripts; // dodanie linii do tabeli, (show) i (hide) w [s] od aktualnego czasu void -TTranscripts::AddLine( std::string const &txt, float show, float hide, bool it ) { +TTranscripts::AddLine( std::string_view txt, float show, float hide, bool it ) { if( show == hide ) { return; } // komentarz jest ignorowany diff --git a/application/uitranscripts.h b/application/uitranscripts.h index 7db201a1..4c24ffe4 100644 --- a/application/uitranscripts.h +++ b/application/uitranscripts.h @@ -22,7 +22,7 @@ public: // constructors TTranscripts() = default; // methods - void AddLine( std::string const &txt, float show, float hide, bool it ); + void AddLine( std::string_view txt, float show, float hide, bool it ); // dodanie tekstów, długość dźwięku, czy istotne void Add( std::string const &txt, bool background = false ); // usuwanie niepotrzebnych (ok. 10 razy na sekundę) diff --git a/gl/shader.cpp b/gl/shader.cpp index 640d5360..7e28ce51 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -7,7 +7,7 @@ #include "glsl_common.h" #include "utilities/Logs.h" -inline bool strcend(std::string const &value, std::string const &ending) +inline bool strcend(std::string_view value, std::string_view ending) { if (ending.size() > value.size()) return false; diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp index 9c55101c..5a0873d4 100644 --- a/scripting/ladderlogic.cpp +++ b/scripting/ladderlogic.cpp @@ -67,7 +67,7 @@ basic_controller::output( element_handle const Element ) const -> int { } auto -basic_controller::load( std::string const &Filename ) -> bool { +basic_controller::load( std::string_view Filename) -> bool { m_program.clear(); m_updateaccumulator = 0.0; diff --git a/scripting/ladderlogic.h b/scripting/ladderlogic.h index 2c2152c9..545456ab 100644 --- a/scripting/ladderlogic.h +++ b/scripting/ladderlogic.h @@ -60,7 +60,7 @@ class basic_controller { public: // methods - auto load( std::string const &Filename ) -> bool; + auto load( std::string_view Filename) -> bool; auto update( double const Timestep ) -> int; // finds element with specified name, potentially creating new element of specified type initialized with provided arguments. returns: handle to the element template diff --git a/world/MemCell.cpp b/world/MemCell.cpp index 614df1a9..dd2fa241 100644 --- a/world/MemCell.cpp +++ b/world/MemCell.cpp @@ -25,7 +25,7 @@ http://mozilla.org/MPL/2.0/. TMemCell::TMemCell( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} -void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) +void TMemCell::UpdateValues( std::string_view szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) { if (CheckMask & basic_event::flags::mode_add) { // dodawanie wartości diff --git a/world/MemCell.h b/world/MemCell.h index 26c0341c..ff1781ce 100644 --- a/world/MemCell.h +++ b/world/MemCell.h @@ -21,7 +21,7 @@ public: explicit TMemCell( scene::node_data const &Nodedata ); // methods void - UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); + UpdateValues( std::string_view szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); bool Load(cParser *parser); void diff --git a/world/mtable.cpp b/world/mtable.cpp index bb2b7d8d..4b667dac 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -105,7 +105,7 @@ bool TTrainParameters::UpdateMTable( scenario_time const &Time, std::string cons return UpdateMTable( Time.data().wHour, Time.data().wMinute + Time.data().wSecond * 0.0167, NewName ); } -bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &NewName) +bool TTrainParameters::UpdateMTable(double hh, double mm, std::string_view NewName) /*odfajkowanie dojechania do stacji (NewName) i przeliczenie opóźnienia*/ { bool OK; @@ -205,7 +205,7 @@ TTrainParameters::TTrainParameters(std::string const &NewTrainName) NewName(NewTrainName); } -void TTrainParameters::NewName(std::string const &NewTrainName) +void TTrainParameters::NewName(std::string_view NewTrainName) /*wstępne ustawienie parametrów rozkładu jazdy*/ { TrainName = NewTrainName; diff --git a/world/mtable.h b/world/mtable.h index 4ba38ac7..3a965b44 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -78,11 +78,11 @@ class TTrainParameters bool IsTimeToGo(double hh, double mm) const; // returns: difference between specified time and scheduled departure from current stop, in seconds double seconds_until_departure( double const Hour, double const Minute ) const; - bool UpdateMTable(double hh, double mm, std::string const &NewName); + bool UpdateMTable(double hh, double mm, std::string_view NewName); bool UpdateMTable( scenario_time const &Time, std::string const &NewName ); bool RewindTimeTable( std::string actualStationName ); explicit TTrainParameters( std::string const &NewTrainName = "none" ); - void NewName(std::string const &NewTrainName); + void NewName(std::string_view NewTrainName); void UpdateVelocity(int StationCount, double vActual); bool LoadTTfile(std::string const &scnpath, int iPlus, double vmax); bool DirectionChange() const;