fix: fix many clang tidy errors (9/x)

Totto16 · Totto16 · commit 944b9650f217 · 2024-10-31T17:56:43.000+01:00
this is part 9 of 143 errors in the whole codebase, it is split into multiple commits, so that each patch is not to big
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -52,7 +52,7 @@ jobs:
           tidy-checks: ''
           step-summary: true
           file-annotations: true
-          ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|src/lobby/curl_client.*
+          ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|tests|src/lobby/curl_client.*
 
       - name: Fail CI run if linter checks failed
         if: steps.linter.outputs.checks-failed != 0
diff --git a/src/executables/game/application.cpp b/src/executables/game/application.cpp
@@ -201,10 +201,11 @@ void Application::update() {
                                 },
                                 [this](const scenes::Scene::Switch& scene_switch) {
                                     spdlog::info(
-                                            "switching to scene {}", magic_enum::enum_name(scene_switch.target_scene)
+                                            "switching to scene {}", magic_enum::enum_name(scene_switch.m_target_scene)
+                                    );
+                                    auto scene = scenes::create_scene(
+                                            *this, scene_switch.m_target_scene, scene_switch.m_layout
                                     );
-                                    auto scene =
-                                            scenes::create_scene(*this, scene_switch.target_scene, scene_switch.layout);
 
                                     // only clear, after the construction was successful
                                     m_scene_stack.clear();
diff --git a/src/executables/game/application.hpp b/src/executables/game/application.hpp
@@ -45,7 +45,8 @@ struct Application final : public EventListener, public ServiceProvider {
 #endif
 
 protected:
-    EventDispatcher m_event_dispatcher; // NOLINT(misc-non-private-member-variables-in-classes)
+    EventDispatcher
+            m_event_dispatcher; //NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
 
 private:
     std::vector<std::unique_ptr<scenes::Scene>> m_scene_stack;
diff --git a/src/graphics/rect.hpp b/src/graphics/rect.hpp
@@ -17,9 +17,9 @@ namespace shapes {
         constexpr AbstractRect(Point top_left, Point bottom_right) // NOLINT(bugprone-easily-swappable-parameters)
             : top_left{ top_left },
               bottom_right{ bottom_right } { }
-        constexpr AbstractRect(T x, T y, T width, T height)
-            : top_left{ x, y },
-              bottom_right{ x + width - 1, y + height - 1 } { }
+        constexpr AbstractRect(T x_pos, T y_pos, T width, T height)
+            : top_left{ x_pos, y_pos },
+              bottom_right{ x_pos + width - 1, y_pos + height - 1 } { }
 
         [[nodiscard]] constexpr T width() const {
             return static_cast<T>(bottom_right.x - top_left.x + 1);
diff --git a/src/graphics/renderer.cpp b/src/graphics/renderer.cpp
@@ -100,8 +100,8 @@ void Renderer::draw_self_computed_circle_impl(const shapes::IPoint& center, i32
     while (x_pos >= y_pos) {
         //  Each of the following renders an octant of the circle
         SDL_RenderDrawPoint(
-                m_renderer, center_x + x_pos,
-                center_y - y_pos // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
+                m_renderer, center_x + x_pos, // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
+                center_y - y_pos
         );
         SDL_RenderDrawPoint(m_renderer, center_x + x_pos, center_y + y_pos);
         SDL_RenderDrawPoint(m_renderer, center_x - x_pos, center_y - y_pos);
diff --git a/src/graphics/renderer.hpp b/src/graphics/renderer.hpp
@@ -73,9 +73,9 @@ struct Renderer final {
     }
 
     template<typename S, typename T>
-    void draw_texture(const Texture& texture, const shapes::AbstractRect<S>& from, const shapes::AbstractRect<T>& to)
+    void draw_texture(const Texture& texture, const shapes::AbstractRect<S>& from, const shapes::AbstractRect<T>& dest)
             const {
-        texture.render(m_renderer, from, to);
+        texture.render(m_renderer, from, dest);
     }
 
     OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture load_image(const std::filesystem::path& image_path) const;
diff --git a/src/graphics/texture.hpp b/src/graphics/texture.hpp
@@ -56,9 +56,9 @@ struct Texture {
     }
 
     template<typename T>
-    void render(SDL_Renderer* renderer, const shapes::AbstractRect<T>& from, const shapes::URect& to) const {
+    void render(SDL_Renderer* renderer, const shapes::AbstractRect<T>& from, const shapes::URect& dest) const {
         const SDL_Rect from_rect_sdl = from.to_sdl_rect();
-        const SDL_Rect to_rect_sdl = to.to_sdl_rect();
+        const SDL_Rect to_rect_sdl = dest.to_sdl_rect();
         SDL_RenderCopy(renderer, m_raw_texture, &from_rect_sdl, &to_rect_sdl);
     }
 
diff --git a/src/scenes/recording_selector/recording_chooser.cpp b/src/scenes/recording_selector/recording_chooser.cpp
@@ -37,7 +37,7 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(
 
                 if (result.has_value()) {
                     for (const auto& path : result.value()) {
-                        this->currently_chosen_files.push_back(path);
+                        this->m_currently_chosen_files.push_back(path);
                     }
                 } else {
                     spdlog::warn("error in dialog: {}", result.error());
@@ -66,7 +66,7 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(
                         for (const auto& file : std::filesystem::recursive_directory_iterator(result.value())) {
                             auto header_value = recorder::RecordingReader::is_header_valid(file.path());
                             if (header_value.has_value()) {
-                                this->currently_chosen_files.push_back(file.path());
+                                this->m_currently_chosen_files.push_back(file.path());
                             }
                         }
                     }
@@ -116,14 +116,14 @@ helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>> custom_ui::Reco
 
 [[nodiscard]] const std::vector<std::filesystem::path>& custom_ui::RecordingFileChooser::get_currently_chosen_files(
 ) const {
-    return currently_chosen_files;
+    return m_currently_chosen_files;
 }
 
 //TODO(Totto):  solve in another way, that is better
 void custom_ui::RecordingFileChooser::prepare_dialog(ServiceProvider* service_provider) {
 
     //TODO(Totto): show scene on top, that hints of the dialog
-    this->currently_chosen_files.clear();
+    this->m_currently_chosen_files.clear();
     service_provider->event_dispatcher().disable();
 }
 
diff --git a/src/scenes/recording_selector/recording_chooser.hpp b/src/scenes/recording_selector/recording_chooser.hpp
@@ -16,7 +16,7 @@ namespace custom_ui {
     struct RecordingFileChooser final : public ui::Widget, public ui::Focusable, public ui::Hoverable {
     private:
         ui::GridLayout m_main_grid;
-        std::vector<std::filesystem::path> currently_chosen_files{};
+        std::vector<std::filesystem::path> m_currently_chosen_files;
 
     public:
         OOPETRIS_GRAPHICS_EXPORTED explicit RecordingFileChooser(
diff --git a/src/scenes/scene.hpp b/src/scenes/scene.hpp
@@ -19,12 +19,12 @@ namespace scenes {
     struct Scene {
     public:
         struct Switch {
-            SceneId target_scene;
-            ui::Layout layout;
+            SceneId m_target_scene;
+            ui::Layout m_layout;
 
             Switch(const SceneId target_scene, const ui::Layout& layout)
-                : target_scene{ target_scene },
-                  layout{ layout } { }
+                : m_target_scene{ target_scene },
+                  m_layout{ layout } { }
         };
 
         struct RawSwitch {
@@ -62,7 +62,8 @@ namespace scenes {
         using UpdateResult = std::pair<SceneUpdate, std::optional<Change>>;
 
     protected:
-        ServiceProvider* m_service_provider;
+        ServiceProvider*
+                m_service_provider; //NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
 
     private:
         ui::Layout m_layout;
diff --git a/src/scenes/settings_menu/settings_details.hpp b/src/scenes/settings_menu/settings_details.hpp
@@ -8,7 +8,7 @@ namespace settings {
 
     struct SettingsDetails {
         [[nodiscard]] virtual scenes::Scene::Change get_details_scene() = 0;
-        virtual inline ~SettingsDetails() = default;
+        virtual ~SettingsDetails() = default;
     };
 
 
diff --git a/src/ui/components/color_picker.hpp b/src/ui/components/color_picker.hpp
@@ -45,7 +45,7 @@ namespace detail {
 
     private:
         ServiceProvider* m_service_provider;
-        std::unique_ptr<Texture> m_texture{};
+        std::unique_ptr<Texture> m_texture;
         HSVColor m_current_color;
         Callback m_callback;
         bool m_is_dragging{ false };
diff --git a/src/ui/components/textinput.hpp b/src/ui/components/textinput.hpp
@@ -17,7 +17,7 @@ namespace ui {
 
     struct TextInput final : public Widget, public Focusable, public Hoverable {
     private:
-        std::string m_text{};
+        std::string m_text;
         u32 m_cursor_position{ 0 };
         ServiceProvider* m_service_provider;
         Font m_font;
diff --git a/src/ui/layouts/grid_layout.cpp b/src/ui/layouts/grid_layout.cpp
@@ -12,15 +12,15 @@ ui::GridLayout::GridLayout(
                 bool is_top_level 
         )
             : FocusLayout{ layout, focus_id, FocusOptions{ .wrap_around=is_top_level, .allow_tab=is_top_level }, is_top_level },
-              size{ size },
-              direction{ direction },
-              gap{ gap },
-              margin{ static_cast<u32>(margin.first * layout.get_rect().width()),
+              m_size{ size },
+              m_direction{ direction },
+              m_gap{ gap },
+              m_margin{ static_cast<u32>(margin.first * layout.get_rect().width()),
                       static_cast<u32>(margin.second * layout.get_rect().height()) } {
         }
 
 [[nodiscard]] u32 ui::GridLayout::total_size() const {
-    return size;
+    return m_size;
 }
 
 void ui::GridLayout::render(const ServiceProvider& service_provider) const {
@@ -31,33 +31,33 @@ void ui::GridLayout::render(const ServiceProvider& service_provider) const {
 
 
 [[nodiscard]] ui::Layout ui::GridLayout::get_layout_for_index(u32 index) {
-    if (index >= this->size) {
+    if (index >= this->m_size) {
         throw std::runtime_error("GridLayout is already full");
     }
 
     const auto start_point = layout().get_rect().top_left;
 
-    u32 x_pos = start_point.x + margin.first;
-    u32 y_pos = start_point.y + margin.second;
-    u32 width = layout().get_rect().width() - (margin.first * 2);
-    u32 height = layout().get_rect().height() - (margin.second * 2);
+    u32 x_pos = start_point.x + m_margin.first;
+    u32 y_pos = start_point.y + m_margin.second;
+    u32 width = layout().get_rect().width() - (m_margin.first * 2);
+    u32 height = layout().get_rect().height() - (m_margin.second * 2);
 
-    if (direction == Direction::Horizontal) {
-        const u32 total_margin = this->size <= 1 ? 0 : (this->size - 1) * gap.get_margin();
-        assert(layout().get_rect().width() > (total_margin + (margin.first * 2))
+    if (m_direction == Direction::Horizontal) {
+        const u32 total_margin = this->m_size <= 1 ? 0 : (this->m_size - 1) * m_gap.get_margin();
+        assert(layout().get_rect().width() > (total_margin + (m_margin.first * 2))
                && "width has to be greater than the margins");
-        width = (layout().get_rect().width() - total_margin - (margin.first * 2)) / this->size;
+        width = (layout().get_rect().width() - total_margin - (m_margin.first * 2)) / this->m_size;
 
-        const u32 margin_x = index * gap.get_margin();
+        const u32 margin_x = index * m_gap.get_margin();
         const u32 total_width = width * index;
         x_pos += margin_x + total_width;
     } else {
-        const u32 total_margin = this->size <= 1 ? 0 : (this->size - 1) * gap.get_margin();
-        assert(layout().get_rect().height() > (total_margin - (margin.second * 2))
+        const u32 total_margin = this->m_size <= 1 ? 0 : (this->m_size - 1) * m_gap.get_margin();
+        assert(layout().get_rect().height() > (total_margin - (m_margin.second * 2))
                && "height has to be greater than the margins");
-        height = (layout().get_rect().height() - total_margin - (margin.second * 2)) / this->size;
+        height = (layout().get_rect().height() - total_margin - (m_margin.second * 2)) / this->m_size;
 
-        const u32 margin_y = index * gap.get_margin();
+        const u32 margin_y = index * m_gap.get_margin();
         const u32 total_height = height * index;
         y_pos += margin_y + total_height;
     }
diff --git a/src/ui/layouts/grid_layout.hpp b/src/ui/layouts/grid_layout.hpp
@@ -7,10 +7,10 @@
 namespace ui {
     struct GridLayout : public FocusLayout {
     private:
-        u32 size;
-        Direction direction;
-        Margin gap;
-        std::pair<u32, u32> margin;
+        u32 m_size;
+        Direction m_direction;
+        Margin m_gap;
+        std::pair<u32, u32> m_margin;
 
     public:
         OOPETRIS_GRAPHICS_EXPORTED explicit GridLayout(
diff --git a/src/ui/layouts/scroll_layout.cpp b/src/ui/layouts/scroll_layout.cpp
diff --git a/src/ui/layouts/scroll_layout.hpp b/src/ui/layouts/scroll_layout.hpp
diff --git a/src/ui/layouts/tile_layout.cpp b/src/ui/layouts/tile_layout.cpp
diff --git a/src/ui/layouts/tile_layout.hpp b/src/ui/layouts/tile_layout.hpp

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ struct Renderer final {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`template<typename S, typename T>`
`76`		`- void draw_texture(const Texture& texture, const shapes::AbstractRect<S>& from, const shapes::AbstractRect<T>& to)`
	`76`	`+ void draw_texture(const Texture& texture, const shapes::AbstractRect<S>& from, const shapes::AbstractRect<T>& dest)`
`77`	`77`	`const {`
`78`		`- texture.render(m_renderer, from, to);`
	`78`	`+ texture.render(m_renderer, from, dest);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture load_image(const std::filesystem::path& image_path) const;`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ struct Texture {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`template<typename T>`
`59`		`- void render(SDL_Renderer* renderer, const shapes::AbstractRect<T>& from, const shapes::URect& to) const {`
	`59`	`+ void render(SDL_Renderer* renderer, const shapes::AbstractRect<T>& from, const shapes::URect& dest) const {`
`60`	`60`	`const SDL_Rect from_rect_sdl = from.to_sdl_rect();`
`61`		`- const SDL_Rect to_rect_sdl = to.to_sdl_rect();`
	`61`	`+ const SDL_Rect to_rect_sdl = dest.to_sdl_rect();`
`62`	`62`	`SDL_RenderCopy(renderer, m_raw_texture, &from_rect_sdl, &to_rect_sdl);`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(`
`37`	`37`
`38`	`38`	`if (result.has_value()) {`
`39`	`39`	`for (const auto& path : result.value()) {`
`40`		`- this->currently_chosen_files.push_back(path);`
	`40`	`+ this->m_currently_chosen_files.push_back(path);`
`41`	`41`	`}`
`42`	`42`	`} else {`
`43`	`43`	`spdlog::warn("error in dialog: {}", result.error());`
`@@ -66,7 +66,7 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(`
`66`	`66`	`for (const auto& file : std::filesystem::recursive_directory_iterator(result.value())) {`
`67`	`67`	`auto header_value = recorder::RecordingReader::is_header_valid(file.path());`
`68`	`68`	`if (header_value.has_value()) {`
`69`		`- this->currently_chosen_files.push_back(file.path());`
	`69`	`+ this->m_currently_chosen_files.push_back(file.path());`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -116,14 +116,14 @@ helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>> custom_ui::Reco`
`116`	`116`
`117`	`117`	`[[nodiscard]] const std::vector<std::filesystem::path>& custom_ui::RecordingFileChooser::get_currently_chosen_files(`
`118`	`118`	`) const {`
`119`		`- return currently_chosen_files;`
	`119`	`+ return m_currently_chosen_files;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`//TODO(Totto): solve in another way, that is better`
`123`	`123`	`void custom_ui::RecordingFileChooser::prepare_dialog(ServiceProvider* service_provider) {`
`124`	`124`
`125`	`125`	`//TODO(Totto): show scene on top, that hints of the dialog`
`126`		`- this->currently_chosen_files.clear();`
	`126`	`+ this->m_currently_chosen_files.clear();`
`127`	`127`	`service_provider->event_dispatcher().disable();`
`128`	`128`	`}`
`129`	`129`