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

Totto16 · Totto16 · commit 5952e37640d9 · 2024-10-31T17:54:10.000+01:00
this is part 3 of 143 errors in the whole codebase, it is split into multiple commits, so that each patch is not to big
diff --git a/src/helper/nfd.cpp b/src/helper/nfd.cpp
@@ -56,7 +56,7 @@ namespace {
                 auto* extensions = new nfdu8char_t[extension_list_size]; // NOLINT(cppcoreguidelines-owning-memory)
                 std::memcpy(extensions, extension_list.c_str(), extension_list_size * sizeof(nfdu8char_t));
 
-                filter_item.get()[i] = { name, extensions };
+                filter_item.get()[i] = { .name = name, .spec = extensions };
             }
         }
 
@@ -68,7 +68,7 @@ namespace {
 } // namespace
 
 
-helper::expected<std::filesystem::path, std::string> helper::openFileDialog(
+helper::expected<std::filesystem::path, std::string> helper::open_file_dialog(
         const std::vector<AllowedFile>& allowed_files,
         std::optional<std::filesystem::path> default_path
 ) {
@@ -108,7 +108,7 @@ helper::expected<std::filesystem::path, std::string> helper::openFileDialog(
 }
 
 
-[[nodiscard]] helper::expected<std::vector<std::filesystem::path>, std::string> helper::openMultipleFilesDialog(
+[[nodiscard]] helper::expected<std::vector<std::filesystem::path>, std::string> helper::open_multiple_files_dialog(
         const std::vector<AllowedFile>& allowed_files,
         std::optional<std::filesystem::path> default_path
 ) {
@@ -160,7 +160,7 @@ helper::expected<std::filesystem::path, std::string> helper::openFileDialog(
     return helper::unexpected<std::string>{ "Error: " + std::string{ NFD::GetError() } };
 }
 
-[[nodiscard]] helper::expected<std::filesystem::path, std::string> helper::openFolderDialog(
+[[nodiscard]] helper::expected<std::filesystem::path, std::string> helper::open_folder_dialog(
         std::optional<std::filesystem::path> default_path
 ) {
 
diff --git a/src/helper/nfd_include.hpp b/src/helper/nfd_include.hpp
@@ -27,17 +27,17 @@ namespace helper {
 
 
     //NOTE: this API is blocking and can't be asynchronous, due to os (linux, windows, macos) restrictions, it HAS to be launched in the same thread NFD_Init() was launched /the main thread)
-    [[nodiscard]] helper::expected<std::filesystem::path, std::string> openFileDialog(
+    [[nodiscard]] helper::expected<std::filesystem::path, std::string> open_file_dialog(
             const std::vector<AllowedFile>& allowed_files = {},
             std::optional<std::filesystem::path> default_path = std::nullopt
     );
 
-    [[nodiscard]] helper::expected<std::vector<std::filesystem::path>, std::string> openMultipleFilesDialog(
+    [[nodiscard]] helper::expected<std::vector<std::filesystem::path>, std::string> open_multiple_files_dialog(
             const std::vector<AllowedFile>& allowed_files = {},
             std::optional<std::filesystem::path> default_path = std::nullopt
     );
 
-    [[nodiscard]] helper::expected<std::filesystem::path, std::string> openFolderDialog(
+    [[nodiscard]] helper::expected<std::filesystem::path, std::string> open_folder_dialog(
             std::optional<std::filesystem::path> default_path = std::nullopt
     );
 
diff --git a/src/libs/core/helper/color.cpp b/src/libs/core/helper/color.cpp
@@ -119,13 +119,13 @@ namespace {
     }
 
     // use custom fmod, that always result in a positive value
-    const FloatType h = h_temp * static_cast<FloatType>(60.0); //degrees
+    const FloatType hue = h_temp * static_cast<FloatType>(60.0); //degrees
 
-    const FloatType s = max == static_cast<FloatType>(0.0) ? static_cast<FloatType>(0.0) : delta / max;
+    const FloatType saturation = max == static_cast<FloatType>(0.0) ? static_cast<FloatType>(0.0) : delta / max;
 
     //v = max
 
-    return HSVColor{ static_cast<double>(h), static_cast<double>(s), static_cast<double>(max), a };
+    return HSVColor{ static_cast<double>(hue), static_cast<double>(saturation), static_cast<double>(max), a };
 }
 
 //Note: this output formats are all deserializable by the from_string method!
diff --git a/src/manager/music_manager.cpp b/src/manager/music_manager.cpp
@@ -340,7 +340,7 @@ std::optional<double> MusicManager::change_volume(const std::int8_t steps) {
                 return 1.0F;
             }
 
-            new_volume = current_volume.value() + MusicManager::step_width * static_cast<double>(steps);
+            new_volume = current_volume.value() + (MusicManager::step_width * static_cast<double>(steps));
         }
 
         if (new_volume >= 1.0F) {
diff --git a/src/scenes/loading_screen/loading_screen.cpp b/src/scenes/loading_screen/loading_screen.cpp
@@ -84,7 +84,7 @@ void scenes::LoadingScreen::update() {
 
         const auto offset = std::numbers::pi_v<double> * 2.0 * static_cast<double>(length - i - 1) / length_d;
 
-        scale = std::min(amplitude * std::sin(time * speed + offset) + scale_offset, 1.0);
+        scale = std::min((amplitude * std::sin((time * speed) + offset)) + scale_offset, 1.0);
     }
     //
 }
@@ -122,6 +122,6 @@ void scenes::LoadingScreen::render(const ServiceProvider& service_provider) cons
 [[nodiscard]] shapes::UPoint scenes::LoadingScreen::to_screen_coords(const Mino::GridPoint& point, u32 tile_size)
         const {
     const auto start_edge = m_start_offset + point.cast<u32>() * m_tile_size;
-    const auto inner_offset = m_tile_size - tile_size / 2;
+    const auto inner_offset = m_tile_size - (tile_size / 2);
     return start_edge + shapes::UPoint{ inner_offset, inner_offset };
 }
diff --git a/src/scenes/recording_selector/recording_chooser.cpp b/src/scenes/recording_selector/recording_chooser.cpp
@@ -31,8 +31,8 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(
             [service_provider, this](const ui::TextButton&) -> bool {
                 this->prepare_dialog(service_provider);
 
-                const auto result = helper::openMultipleFilesDialog({
-                        { "OOPetris Recording", { constants::recording::extension } }
+                const auto result = helper::open_multiple_files_dialog({
+                        { .name = "OOPetris Recording", .extension_list = { constants::recording::extension } }
                 });
 
                 if (result.has_value()) {
@@ -58,7 +58,7 @@ custom_ui::RecordingFileChooser::RecordingFileChooser(
             [this, service_provider](const ui::TextButton&) -> bool {
                 this->prepare_dialog(service_provider);
 
-                const auto result = helper::openFolderDialog();
+                const auto result = helper::open_folder_dialog();
 
                 if (result.has_value()) {
 
diff --git a/src/scenes/recording_selector/recording_selector.cpp b/src/scenes/recording_selector/recording_selector.cpp
@@ -25,7 +25,7 @@
 
 namespace scenes {
 
-    using namespace details::recording::selector;
+    using namespace details::recording::selector; //NOLINT(google-build-using-namespace)
 
     RecordingSelector::RecordingSelector(ServiceProvider* service_provider, const ui::Layout& layout)
         : Scene{ service_provider, layout },
diff --git a/src/scenes/settings_menu/settings_menu.cpp b/src/scenes/settings_menu/settings_menu.cpp
@@ -17,7 +17,7 @@
 
 namespace scenes {
 
-    using namespace details::settings::menu;
+    using namespace details::settings::menu; // NOLINT(google-build-using-namespace)
 
     SettingsMenu::SettingsMenu(ServiceProvider* service_provider, const ui::Layout& layout)
         : SettingsMenu{ service_provider, layout, std::nullopt } { }
@@ -133,7 +133,7 @@ namespace scenes {
 
             scroll_layout->add<custom_ui::ColorSettingRow>(
                     ui::RelativeItemSize{ scroll_layout->layout(), 0.2 }, service_provider,
-                    //TODO use real settings name
+                    //TODO(Totto): use real settings name
                     fmt::format("Color {}", color_index), color,
                     [this, color_index](const Color& updated_color) { this->m_colors.at(color_index) = updated_color; },
                     focus_helper.focus_id()
diff --git a/tests/core/color.cpp b/tests/core/color.cpp
@@ -26,24 +26,27 @@ namespace {
 
 } // namespace
 
+
 // helper thought just for the tests
-[[nodiscard]] constexpr bool operator==(const HSVColor& value1, const HSVColor& value2) {
+[[nodiscard]] constexpr bool
+operator==(const HSVColor& value1, const HSVColor& value2) { //NOLINT(misc-use-internal-linkage)
     return value1.to_rgb_color() == value2.to_rgb_color();
 }
 
 
 // make colors printable
-void PrintTo(const Color& color, std::ostream* os) {
+void PrintTo(const Color& color, std::ostream* os) { //NOLINT(misc-use-internal-linkage)
     *os << color.to_string();
 }
 
-void PrintTo(const HSVColor& color, std::ostream* os) {
+void PrintTo(const HSVColor& color, std::ostream* os) { //NOLINT(misc-use-internal-linkage)
     *os << color.to_string();
 }
 
+
 namespace color {
 
-    void PrintTo(const SerializeMode& value, std::ostream* os) {
+    void PrintTo(const SerializeMode& value, std::ostream* os) { //NOLINT(misc-use-internal-linkage)
         *os << magic_enum::enum_name(value);
     }
 
diff --git a/tests/graphics/sdl_key.cpp b/tests/graphics/sdl_key.cpp
@@ -13,12 +13,12 @@
 namespace sdl {
 
     // make keys printable
-    void PrintTo(const Key& key, std::ostream* os) {
+    void PrintTo(const Key& key, std::ostream* os) { //NOLINT(misc-use-internal-linkage)
         *os << key.to_string();
     }
 
 
-    std::ostream& operator<<(std::ostream& os, const Key& value) {
+    std::ostream& operator<<(std::ostream& os, const Key& value) { //NOLINT(misc-use-internal-linkage)
         os << value.to_string();
         return os;
     }

Original file line number	Diff line number	Diff line change
`@@ -119,13 +119,13 @@ namespace {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// use custom fmod, that always result in a positive value`
`122`		`- const FloatType h = h_temp * static_cast<FloatType>(60.0); //degrees`
	`122`	`+ const FloatType hue = h_temp * static_cast<FloatType>(60.0); //degrees`
`123`	`123`
`124`		`- const FloatType s = max == static_cast<FloatType>(0.0) ? static_cast<FloatType>(0.0) : delta / max;`
	`124`	`+ const FloatType saturation = max == static_cast<FloatType>(0.0) ? static_cast<FloatType>(0.0) : delta / max;`
`125`	`125`
`126`	`126`	`//v = max`
`127`	`127`
`128`		`- return HSVColor{ static_cast<double>(h), static_cast<double>(s), static_cast<double>(max), a };`
	`128`	`+ return HSVColor{ static_cast<double>(hue), static_cast<double>(saturation), static_cast<double>(max), a };`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`//Note: this output formats are all deserializable by the from_string method!`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ std::optional<double> MusicManager::change_volume(const std::int8_t steps) {`
`340`	`340`	`return 1.0F;`
`341`	`341`	`}`
`342`	`342`
`343`		`- new_volume = current_volume.value() + MusicManager::step_width * static_cast<double>(steps);`
	`343`	`+ new_volume = current_volume.value() + (MusicManager::step_width * static_cast<double>(steps));`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`if (new_volume >= 1.0F) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void scenes::LoadingScreen::update() {`
`84`	`84`
`85`	`85`	`const auto offset = std::numbers::pi_v<double> * 2.0 * static_cast<double>(length - i - 1) / length_d;`
`86`	`86`
`87`		`- scale = std::min(amplitude * std::sin(time * speed + offset) + scale_offset, 1.0);`
	`87`	`+ scale = std::min((amplitude * std::sin((time * speed) + offset)) + scale_offset, 1.0);`
`88`	`88`	`}`
`89`	`89`	`//`
`90`	`90`	`}`
`@@ -122,6 +122,6 @@ void scenes::LoadingScreen::render(const ServiceProvider& service_provider) cons`
`122`	`122`	`[[nodiscard]] shapes::UPoint scenes::LoadingScreen::to_screen_coords(const Mino::GridPoint& point, u32 tile_size)`
`123`	`123`	`const {`
`124`	`124`	`const auto start_edge = m_start_offset + point.cast<u32>() * m_tile_size;`
`125`		`- const auto inner_offset = m_tile_size - tile_size / 2;`
	`125`	`+ const auto inner_offset = m_tile_size - (tile_size / 2);`
`126`	`126`	`return start_edge + shapes::UPoint{ inner_offset, inner_offset };`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,24 +26,27 @@ namespace {`
`26`	`26`
`27`	`27`	`} // namespace`
`28`	`28`
	`29`	`+`
`29`	`30`	`// helper thought just for the tests`
`30`		`-[[nodiscard]] constexpr bool operator==(const HSVColor& value1, const HSVColor& value2) {`
	`31`	`+[[nodiscard]] constexpr bool`
	`32`	`+operator==(const HSVColor& value1, const HSVColor& value2) { //NOLINT(misc-use-internal-linkage)`
`31`	`33`	`return value1.to_rgb_color() == value2.to_rgb_color();`
`32`	`34`	`}`
`33`	`35`
`34`	`36`
`35`	`37`	`// make colors printable`
`36`		`-void PrintTo(const Color& color, std::ostream* os) {`
	`38`	`+void PrintTo(const Color& color, std::ostream* os) { //NOLINT(misc-use-internal-linkage)`
`37`	`39`	`*os << color.to_string();`
`38`	`40`	`}`
`39`	`41`
`40`		`-void PrintTo(const HSVColor& color, std::ostream* os) {`
	`42`	`+void PrintTo(const HSVColor& color, std::ostream* os) { //NOLINT(misc-use-internal-linkage)`
`41`	`43`	`*os << color.to_string();`
`42`	`44`	`}`
`43`	`45`
	`46`	`+`
`44`	`47`	`namespace color {`
`45`	`48`
`46`		`- void PrintTo(const SerializeMode& value, std::ostream* os) {`
	`49`	`+ void PrintTo(const SerializeMode& value, std::ostream* os) { //NOLINT(misc-use-internal-linkage)`
`47`	`50`	`*os << magic_enum::enum_name(value);`
`48`	`51`	`}`
`49`	`52`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@`
`13`	`13`	`namespace sdl {`
`14`	`14`
`15`	`15`	`// make keys printable`
`16`		`- void PrintTo(const Key& key, std::ostream* os) {`
	`16`	`+ void PrintTo(const Key& key, std::ostream* os) { //NOLINT(misc-use-internal-linkage)`
`17`	`17`	`*os << key.to_string();`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
`21`		`- std::ostream& operator<<(std::ostream& os, const Key& value) {`
	`21`	`+ std::ostream& operator<<(std::ostream& os, const Key& value) { //NOLINT(misc-use-internal-linkage)`
`22`	`22`	`os << value.to_string();`
`23`	`23`	`return os;`
`24`	`24`	`}`