From 7c0f81fb309ff7b8b0158b68fc027b02df7197ac Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 10 Oct 2026 16:37:55 +0200 Subject: [PATCH] refactor(sonar): rely on class template argument deduction (cpp:S6012) Co-Authored-By: Claude Opus 5.5 --- audio/sound.cpp | 4 ++-- rendering/opengl33precipitation.cpp | 2 +- rendering/openglprecipitation.cpp | 2 +- utilities/utilities.cpp | 8 ++++---- utilities/utilities.h | 4 ++-- vehicle/Gauge.cpp | 2 +- widgets/cameraview_extcam.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/audio/sound.cpp b/audio/sound.cpp index 7eba59d6..01d982eb 100644 --- a/audio/sound.cpp +++ b/audio/sound.cpp @@ -393,7 +393,7 @@ sound_source::play_basic() { // dispatch appropriate sound if( true == m_playbeginning && sound(sound_id::begin).buffer != null_handle) { - std::vector sounds { sound_id::begin, sound_id::main }; + std::vector sounds { sound_id::begin, sound_id::main }; insert( std::begin( sounds ), std::end( sounds ) ); m_playbeginning = false; } @@ -1009,7 +1009,7 @@ sound_source::update_soundproofing() { void sound_source::insert( sound_handle const Sound ) { - std::vector sounds { Sound }; + std::vector sounds { Sound }; return insert( std::begin( sounds ), std::end( sounds ) ); } diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp index be08bf50..308248b7 100644 --- a/rendering/opengl33precipitation.cpp +++ b/rendering/opengl33precipitation.cpp @@ -36,7 +36,7 @@ opengl33_precipitation::create( int const Tesselation ) { std::uint16_t index = 0; // auto const radius { 25.f }; // cylinder radius - std::vector radii { 25.f, 10.f, 5.f, 1.f }; + std::vector radii { 25.f, 10.f, 5.f, 1.f }; for( auto radius : radii ) { for( int i = 0; i <= latitudes; ++i ) { diff --git a/rendering/openglprecipitation.cpp b/rendering/openglprecipitation.cpp index fc93b2a9..acf24687 100644 --- a/rendering/openglprecipitation.cpp +++ b/rendering/openglprecipitation.cpp @@ -39,7 +39,7 @@ opengl_precipitation::create( int const Tesselation ) { std::uint16_t index = 0; // auto const radius { 25.f }; // cylinder radius - std::vector radii { 25.f, 10.f, 5.f, 1.f }; + std::vector radii { 25.f, 10.f, 5.f, 1.f }; for( auto radius : radii ) { for( int i = 0; i <= latitudes; ++i ) { diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index a930bce2..5e4083b1 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -127,14 +127,14 @@ bool ClearFlag(int &Flag, int const Value) double Random(double min, double max) { if (max < min) { std::swap(min, max); } // std::uniform_real_distribution requires min <= max (inverted bounds are UB) - std::uniform_real_distribution dist(min, max); + std::uniform_real_distribution dist(min, max); return dist(Global.random_engine); } int Random(int min, int max) { if (max < min) { std::swap(min, max); } // std::uniform_int_distribution requires min <= max (inverted bounds are UB) - std::uniform_int_distribution dist(min, max); + std::uniform_int_distribution dist(min, max); return dist(Global.random_engine); } @@ -178,7 +178,7 @@ std::uint32_t seed_of(std::string const &Text) std::string generate_uuid_v4() { - std::uniform_int_distribution dist(0, 255); + std::uniform_int_distribution dist(0, 255); std::array bytes; for (auto &b : bytes) @@ -203,7 +203,7 @@ std::string generate_uuid_v4() double LocalRandom(double a, double b) { if (b < a) { std::swap(a, b); } // std::uniform_real_distribution requires a <= b (inverted bounds are UB) - std::uniform_real_distribution dist(a, b); + std::uniform_real_distribution dist(a, b); return dist(Global.local_random_engine); } diff --git a/utilities/utilities.h b/utilities/utilities.h index f78aa965..78107583 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -426,12 +426,12 @@ class condition_variable // methods void wait() { - std::unique_lock lock(m_mutex); + std::unique_lock lock(m_mutex); m_condition.wait(lock, [this]() { return m_spurious == false; }); } template void wait_for(const std::chrono::duration &Time) { - std::unique_lock lock(m_mutex); + std::unique_lock lock(m_mutex); m_condition.wait_for(lock, Time, [this]() { return m_spurious == false; }); } void notify_one() diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index 51389e5e..68248d7d 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -76,7 +76,7 @@ void TGauge::Init(TSubModel *Submodel, TSubModel *Submodelon, TGaugeAnimation Ty auto const nulloffset { glm::vec3{} }; auto const offset { model_offset() }; { - std::vector soundfxs = { + std::vector soundfxs = { &m_soundfxincrease, &m_soundfxdecrease, &m_soundfxon, diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp index 608e91a2..48d7c9da 100644 --- a/widgets/cameraview_extcam.cpp +++ b/widgets/cameraview_extcam.cpp @@ -180,7 +180,7 @@ void ui::cameraview_panel::record_func() while (record_state == RUNNING) { if (bufpos == frame_size) { - std::unique_lock lock(mutex); + std::unique_lock lock(mutex); auto r = notify_var.wait_for(lock, std::chrono::milliseconds(50), [this, last_cnt]{return last_cnt != frame_cnt;}); last_cnt = frame_cnt; if (!image_ptr || !r)