From f6736fa2332823579cd866130334bc4ef8fb9180 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 10 Oct 2026 17:16:40 +0200 Subject: [PATCH] refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. --- McZapkie/MOVER.h | 14 +++++++------- McZapkie/Mover.cpp | 14 +++++++------- audio/sound.h | 4 ++-- extras/piped_proc.cpp | 4 ++-- extras/piped_proc.h | 2 +- gl/shader.cpp | 2 +- gl/shader.h | 2 +- input/gamepadinput.cpp | 2 +- input/gamepadinput.h | 2 +- network/network.cpp | 2 +- network/network.h | 2 +- rendering/openglcamera.h | 2 +- scene/sn_utils.cpp | 2 +- scene/sn_utils.h | 2 +- scripting/PyInt.cpp | 2 +- scripting/PyInt.h | 2 +- scripting/ladderlogic.cpp | 2 +- scripting/ladderlogic.h | 2 +- scripting/pythonscreenviewer.cpp | 2 +- scripting/pythonscreenviewer.h | 2 +- utilities/comparison.h | 4 ++-- utilities/dictionary.h | 4 ++-- vehicle/Train.cpp | 2 +- vehicle/Train.h | 2 +- world/mtable.cpp | 2 +- world/mtable.h | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 9cd02ec5..8e271997 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2287,7 +2287,7 @@ class TMoverParameters bool AIHintPantUpIfIdle{true}; // whether raise both pantographs if idling for a while double AIHintLocalBrakeAccFactor{1.05}; // suggested acceleration weight for local brake operation - TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab); + TMoverParameters(double VelInitial, std::string const &TypeNameInit, std::string const &NameInit, int Cab); // obsługa sprzęgów static double CouplerDist(TMoverParameters const *Left, TMoverParameters const *Right); static double Distance(const TLocation &Loc1, const TLocation &Loc2, const TDimension &Dim1, const TDimension &Dim2); @@ -2331,12 +2331,12 @@ class TMoverParameters double EngineMaxRPM() const; /*! przesylanie komend sterujacych*/ - bool SendCtrlToNext(std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype = coupling::control); - bool SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype = coupling::control); + bool SendCtrlToNext(std::string const &CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype = coupling::control); + bool SetInternalCommand(std::string const &NewCommand, double NewValue1, double NewValue2, int const Couplertype = coupling::control); double GetExternalCommand(std::string &Command) const; - bool RunCommand(std::string Command, double CValue1, double CValue2, int const Couplertype = coupling::control); + bool RunCommand(std::string const &Command, double CValue1, double CValue2, int const Couplertype = coupling::control); bool RunInternalCommand(); - void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation); + void PutCommand(std::string const &NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation); bool CabActivisation(bool const Enforce = false); bool CabDeactivisation(bool const Enforce = false); bool CabActivisationAuto(bool const Enforce = false); @@ -2533,7 +2533,7 @@ class TMoverParameters bool ChangeOffsetH(double DeltaOffset); /*funkcje ladujace pliki opisujace pojazd*/ - bool LoadFIZ(std::string chkpath); // Q 20160717 bool LoadChkFile(std::string chkpath); + bool LoadFIZ(std::string const &chkpath); // Q 20160717 bool LoadChkFile(std::string chkpath); bool CheckLocomotiveParameters(bool ReadyFlag, int Dir); std::string EngineDescription(int what) const; @@ -2569,7 +2569,7 @@ class TMoverParameters void LoadFIZ_LightsList(std::string const &Input); void LoadFIZ_DimmerList(std::string const &Input); void LoadFIZ_CompressorList(std::string const &Input); - void LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Input); + void LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const &Prefix, std::string const &Input); TPowerType LoadFIZ_PowerDecode(std::string const &Power) const; TPowerSource LoadFIZ_SourceDecode(std::string const &Source) const; TEngineType LoadFIZ_EngineDecode(std::string const &Engine) const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4159fa29..760f1fbd 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -460,7 +460,7 @@ double TMoverParameters::Current(double n, double U) // ************************************************************************************************* // główny konstruktor // ************************************************************************************************* -TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab) : TypeName(TypeNameInit), Name(NameInit), CabOccupied(Cab) +TMoverParameters::TMoverParameters(double VelInitial, std::string const &TypeNameInit, std::string const &NameInit, int Cab) : TypeName(TypeNameInit), Name(NameInit), CabOccupied(Cab) { WriteLog("------------------------------------------------------"); WriteLog("init default physic values for " + NameInit + ", [" + TypeNameInit + "]"); @@ -9607,7 +9607,7 @@ void TMoverParameters::BrakeSubsystemDecode() // TDynamicObject::Init() // Po niej wykonywana jest CreateBrakeSys(), ktora jest odpowiednikiem CheckLocomotiveParameters() // ************************************************************************************************* -bool TMoverParameters::LoadFIZ(std::string chkpath) +bool TMoverParameters::LoadFIZ(std::string const &chkpath) { chkPath = chkpath; // assign class path for reloading @@ -11547,7 +11547,7 @@ void TMoverParameters::LoadFIZ_CompressorList(std::string const &Input) extract_value(CompressorListDefPos, "Default", Input, ""); } -void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Line) +void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const &Prefix, std::string const &Line) { switch (Powerparameters.SourceType) @@ -12106,7 +12106,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int /*Dir*/) // Q: 20160714 // Wstawia komendę z parametrem, od sprzęgu i w lokalizacji do pojazdu // ************************************************************************************************* -void TMoverParameters::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation) +void TMoverParameters::PutCommand(std::string const &NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation) { CommandLast = NewCommand; // zapamiętanie komendy @@ -12131,7 +12131,7 @@ double TMoverParameters::GetExternalCommand(std::string &Command) const // Q: 20160714 // Ustawienie komendy wraz z parametrami // ************************************************************************************************* -bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype) +bool TMoverParameters::SetInternalCommand(std::string const &NewCommand, double NewValue1, double NewValue2, int const Couplertype) { bool SIC; if (CommandIn.Command == NewCommand && CommandIn.Value1 == NewValue1 && CommandIn.Value2 == NewValue2 && CommandIn.Coupling == Couplertype) @@ -12153,7 +12153,7 @@ bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValu // Q: 20160714 // wysyłanie komendy w kierunku dir (1=przód, -1=tył) do kolejnego pojazdu (jednego) // ************************************************************************************************* -bool TMoverParameters::SendCtrlToNext(std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype) +bool TMoverParameters::SendCtrlToNext(std::string const &CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype) { bool OK; int d; // numer sprzęgu w kierunku którego wysyłamy @@ -12193,7 +12193,7 @@ bool TMoverParameters::SendCtrlToNext(std::string const CtrlCommand, double cons // Komenda musi być zdefiniowana tutaj, a jeśli się wywołuje funkcję, to ona nie może // sama przesyłać do kolejnych pojazdów. Należy też się zastanowić, czy dla uzyskania // jakiejś zmiany (np. IncMainCtrl) lepiej wywołać funkcję, czy od razu wysłać komendę. -bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CValue2, int const Couplertype) +bool TMoverParameters::RunCommand(std::string const &Command, double CValue1, double CValue2, int const Couplertype) { bool OK{false}; diff --git a/audio/sound.h b/audio/sound.h index c1f11876..e9957be0 100644 --- a/audio/sound.h +++ b/audio/sound.h @@ -108,7 +108,7 @@ public: offset() const; // sound source name setter/getter void - name( std::string Name ); + name( std::string const &Name ); std::string const & name() const; // playback starting point shift setter/getter @@ -252,7 +252,7 @@ inline TDynamicObject const * sound_source::owner() const { return m_owner; } inline void sound_source::offset( glm::vec3 const Offset ) { m_offset = Offset; } inline glm::vec3 const & sound_source::offset() const { return m_offset; } // sound source name setter/getter -inline void sound_source::name( std::string Name ) { m_name = Name; } +inline void sound_source::name( std::string const &Name ) { m_name = Name; } inline std::string const & sound_source::name() const { return m_name; } // playback starting point shift setter/getter inline void sound_source::start( float const Offset ) { m_startoffset = Offset; } diff --git a/extras/piped_proc.cpp b/extras/piped_proc.cpp index 492c79ca..81684957 100644 --- a/extras/piped_proc.cpp +++ b/extras/piped_proc.cpp @@ -7,7 +7,7 @@ #include "utilities/Logs.h" #ifdef __unix__ -piped_proc::piped_proc(std::string cmd, bool write) +piped_proc::piped_proc(std::string const &cmd, bool write) { file = popen(cmd.c_str(), write ? "w" : "r"); } @@ -34,7 +34,7 @@ size_t piped_proc::write(unsigned char const *buf, size_t len) return fwrite(buf, 1, len, file); } #elif _WIN32 -piped_proc::piped_proc(std::string cmd, bool write) +piped_proc::piped_proc(std::string const &cmd, bool write) { PROCESS_INFORMATION process; STARTUPINFO siStartInfo; diff --git a/extras/piped_proc.h b/extras/piped_proc.h index 170fe3f5..0e2cb31a 100644 --- a/extras/piped_proc.h +++ b/extras/piped_proc.h @@ -23,7 +23,7 @@ HANDLE pipe_wr = nullptr; #endif public: - explicit piped_proc(std::string cmd, bool write = false); + explicit piped_proc(std::string const &cmd, bool write = false); size_t read(unsigned char *buf, size_t len); size_t write(unsigned char const *buf, size_t len); ~piped_proc(); diff --git a/gl/shader.cpp b/gl/shader.cpp index d276b6c6..640d5360 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -368,7 +368,7 @@ gl::program::program() **this = glCreateProgram(); } -gl::program::program(std::vector> shaders) : program() +gl::program::program(std::vector> const &shaders) : program() { for (const gl::shader &s : shaders) attach(s); diff --git a/gl/shader.h b/gl/shader.h index 1bb45924..f1735a0e 100644 --- a/gl/shader.h +++ b/gl/shader.h @@ -85,7 +85,7 @@ namespace gl { public: program(); - explicit program(std::vector>); + explicit program(std::vector> const &); ~program(); using bindable::bind; diff --git a/input/gamepadinput.cpp b/input/gamepadinput.cpp index 94d626cc..286fe850 100644 --- a/input/gamepadinput.cpp +++ b/input/gamepadinput.cpp @@ -124,7 +124,7 @@ gamepad_input::poll() { } void -gamepad_input::bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const Point ) const { +gamepad_input::bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const &Point ) const { for( auto const &bindingtarget : Targets ) { // grab command(s) associated with the input pin diff --git a/input/gamepadinput.h b/input/gamepadinput.h index 776f65d9..6f411601 100644 --- a/input/gamepadinput.h +++ b/input/gamepadinput.h @@ -77,7 +77,7 @@ private: using inputaxis_sequence = std::vector; // methods bool recall_bindings(); - void bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const Point ) const; + void bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const &Point ) const; void on_button( int const Button, int const Action ); void process_axes(); diff --git a/network/network.cpp b/network/network.cpp index 5d1680c6..026ee2d5 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -218,7 +218,7 @@ std::tuple network::client::get_nex } } -void network::client::send_commands(command_queue::commands_map commands) const +void network::client::send_commands(command_queue::commands_map const &commands) const { if (!conn || conn->state == connection::DEAD || commands.empty()) return; diff --git a/network/network.h b/network/network.h index ebeba8d7..e1d7ec57 100644 --- a/network/network.h +++ b/network/network.h @@ -98,7 +98,7 @@ namespace network public: void update(); std::tuple get_next_delta(int counter); - void send_commands(command_queue::commands_map commands) const; + void send_commands(command_queue::commands_map const &commands) const; int get_frame_counter() const { return static_cast(resume_frame_counter); } diff --git a/rendering/openglcamera.h b/rendering/openglcamera.h index 569a798c..ad223cbd 100644 --- a/rendering/openglcamera.h +++ b/rendering/openglcamera.h @@ -24,7 +24,7 @@ public: update_frustum() { update_frustum( m_projection, m_modelview ); } inline void - update_frustum(glm::mat4 frustumtest_proj) { + update_frustum(glm::mat4 const &frustumtest_proj) { update_frustum(frustumtest_proj, m_modelview); } void update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ); diff --git a/scene/sn_utils.cpp b/scene/sn_utils.cpp index fedf8244..006fcccc 100644 --- a/scene/sn_utils.cpp +++ b/scene/sn_utils.cpp @@ -226,7 +226,7 @@ void sn_utils::s_uint8(std::ostream &s, uint8_t v) s.write((char*)&v, 1); } -void sn_utils::s_str(std::ostream &s, std::string v) +void sn_utils::s_str(std::ostream &s, std::string const &v) { const char* buf = v.c_str(); s.write(buf, v.size() + 1); diff --git a/scene/sn_utils.h b/scene/sn_utils.h index 54005c6c..4212ac29 100644 --- a/scene/sn_utils.h +++ b/scene/sn_utils.h @@ -29,7 +29,7 @@ public: static void ls_float32(std::ostream&, float); static void ls_float64(std::ostream&, double); static void s_uint8(std::ostream&, uint8_t); - static void s_str(std::ostream&, std::string); + static void s_str(std::ostream&, std::string const &); static void s_bool(std::ostream&, bool); static void s_dvec3(std::ostream&, glm::dvec3 const &); static void s_vec3(std::ostream&, glm::vec3 const &); diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp index f5f22e56..7f86532b 100644 --- a/scripting/PyInt.cpp +++ b/scripting/PyInt.cpp @@ -470,7 +470,7 @@ void python_taskqueue::release_lock() const PyEval_SaveThread(); } -auto python_taskqueue::fetch_renderer(std::string const Renderer) -> PyObject * +auto python_taskqueue::fetch_renderer(std::string const &Renderer) -> PyObject * { if (auto const lookup{m_renderers.find(Renderer)}; lookup != std::end(m_renderers)) diff --git a/scripting/PyInt.h b/scripting/PyInt.h index db33a3d1..c8c41039 100644 --- a/scripting/PyInt.h +++ b/scripting/PyInt.h @@ -131,7 +131,7 @@ class python_taskqueue using rendertask_sequence = threading::lockable>>; using uploadtask_sequence = threading::lockable>>; // methods - auto fetch_renderer(std::string const Renderer) -> PyObject *; + auto fetch_renderer(std::string const &Renderer) -> PyObject *; void run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic const &Exit); void error(); diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp index 2e93f51f..0534fefc 100644 --- a/scripting/ladderlogic.cpp +++ b/scripting/ladderlogic.cpp @@ -164,7 +164,7 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool { } auto -basic_controller::insert( std::string const Name, basic_element Element ) -> element_handle { +basic_controller::insert( std::string const &Name, basic_element Element ) -> element_handle { m_elements.push_back( Element ); m_elementnames.push_back( Name ); diff --git a/scripting/ladderlogic.h b/scripting/ladderlogic.h index df8a9b73..80266ce5 100644 --- a/scripting/ladderlogic.h +++ b/scripting/ladderlogic.h @@ -100,7 +100,7 @@ private: // methods auto deserialize_operation( cParser &Input ) -> bool; // adds provided item to the collection. returns: true if there's no duplicate with the same name, false otherwise - auto insert( std::string const Name, basic_element Element ) -> element_handle; + auto insert( std::string const &Name, basic_element Element ) -> element_handle; // runs one cycle of current program. returns: error code or 0 if there's no error auto run() -> int; void log_error( std::string const &Error, int const Line = -1 ) const; diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp index e4730201..4da50151 100644 --- a/scripting/pythonscreenviewer.cpp +++ b/scripting/pythonscreenviewer.cpp @@ -29,7 +29,7 @@ void texture_window_cursor_pos(GLFWwindow *win, double x, double y) texwindow->notify_cursor_pos(win, x, y); } -python_screen_viewer::python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string surfacename) +python_screen_viewer::python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string const &surfacename) : m_rt(rt), m_touchlist(touchlist) { diff --git a/scripting/pythonscreenviewer.h b/scripting/pythonscreenviewer.h index 1049e1dd..ccd78f0e 100644 --- a/scripting/pythonscreenviewer.h +++ b/scripting/pythonscreenviewer.h @@ -35,7 +35,7 @@ class python_screen_viewer void threadfunc(); public: - python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string name); + python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string const &name); ~python_screen_viewer(); void notify_window_size(GLFWwindow const *window, int w, int h) const; diff --git a/utilities/comparison.h b/utilities/comparison.h index 07c0ce02..f0fc5d0a 100644 --- a/utilities/comparison.h +++ b/utilities/comparison.h @@ -55,7 +55,7 @@ to_string( comparison_operator const Operator ) { inline comparison_pass -comparison_pass_from_string( std::string const Input ) { +comparison_pass_from_string( std::string const &Input ) { using enum comparison_pass; if( Input == "all" ) { return all; } else if( Input == "any" ) { return any; } @@ -66,7 +66,7 @@ comparison_pass_from_string( std::string const Input ) { inline comparison_operator -comparison_operator_from_string( std::string const Input ) { +comparison_operator_from_string( std::string const &Input ) { using enum comparison_operator; if( Input == "==" ) { return equal; } else if( Input == "!=" ) { return not_equal; } diff --git a/utilities/dictionary.h b/utilities/dictionary.h index 4b97e5cc..f4554583 100644 --- a/utilities/dictionary.h +++ b/utilities/dictionary.h @@ -28,6 +28,6 @@ struct dictionary_source { inline void insert( std::string const &Key, double const Value ) { floats.emplace_back( Key, Value ); } inline void insert( std::string const &Key, int const Value ) { integers.emplace_back( Key, Value ); } inline void insert( std::string const &Key, bool const Value ) { bools.emplace_back( Key, Value ); } - inline void insert( std::string const &Key, std::string const Value ) { strings.emplace_back( Key, Value ); } - inline void insert( std::string const &Key, std::vector const Value ) { vec2_lists.emplace_back( Key, Value ); } + inline void insert( std::string const &Key, std::string const &Value ) { strings.emplace_back( Key, Value ); } + inline void insert( std::string const &Key, std::vector const &Value ) { vec2_lists.emplace_back( Key, Value ); } }; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 0122da6f..02c372e4 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -76,7 +76,7 @@ std::string control_mapper::find(TSubModel const *Control) const } } -bool control_mapper::contains(std::string const Control) const +bool control_mapper::contains(std::string const &Control) const { return m_names.find(Control) != m_names.end(); diff --git a/vehicle/Train.h b/vehicle/Train.h index 478bb7a2..4fc11dc2 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -71,7 +71,7 @@ public: std::string find( TSubModel const *Control ) const; bool - contains( std::string const Control ) const; + contains( std::string const &Control ) const; }; class TTrain { diff --git a/world/mtable.cpp b/world/mtable.cpp index 7c567d31..bb2b7d8d 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -245,7 +245,7 @@ void TTrainParameters::UpdateVelocity(int Stationcount, double vActual) // return false; //} -bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) +bool TTrainParameters::LoadTTfile(std::string const &scnpath, int iPlus, double vmax) // wczytanie pliku-tabeli z rozkładem przesuniętym o (fPlus); (vMax) nie ma znaczenia { std::string lines; diff --git a/world/mtable.h b/world/mtable.h index 7f853899..4ba38ac7 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -84,7 +84,7 @@ class TTrainParameters explicit TTrainParameters( std::string const &NewTrainName = "none" ); void NewName(std::string const &NewTrainName); void UpdateVelocity(int StationCount, double vActual); - bool LoadTTfile(std::string scnpath, int iPlus, double vmax); + bool LoadTTfile(std::string const &scnpath, int iPlus, double vmax); bool DirectionChange() const; void StationIndexInc(); void serialize( dictionary_source *Output ) const;