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

Totto16 · Totto16 · commit c0089884076e · 2024-10-31T17:54:12.000+01:00
this is part 6 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/game/tetrion.cpp b/src/game/tetrion.cpp
@@ -24,7 +24,7 @@ Tetrion::Tetrion(
     : ui::Widget{ layout , ui::WidgetType::Component ,is_top_level},
         SimulatedTetrion{tetrion_index,random_seed,starting_level, service_provider,std::move(recording_writer)},
       m_main_layout{
-                utils::size_t_identity<2>(),
+                utils::SizeIdentity<2>(),
                 0,
                 ui::Direction::Vertical,
                 { 0.85 },
diff --git a/src/libs/core/helper/point.hpp b/src/libs/core/helper/point.hpp
@@ -76,12 +76,12 @@ namespace shapes {
 
                     assert(x >= static_cast<T>(0) && y >= static_cast<T>(0) && "cast invalid, value to small");
                     assert(static_cast<S>(x) <= std::numeric_limits<S>::max()
-                           && static_cast<S>(y) >= std::numeric_limits<S>::max() && "cast invalid, value to big");
+                           && static_cast<S>(y) <= std::numeric_limits<S>::max() && "cast invalid, value to big");
 
                 } else {
                     // source is unsigned, destination is signed, so only the max check is necessary
 
-                    assert(x <= std::numeric_limits<S>::max() && y >= std::numeric_limits<S>::max()
+                    assert(x <= std::numeric_limits<S>::max() && y <= std::numeric_limits<S>::max()
                            && "cast invalid, value to big");
                 }
             } else {
@@ -91,10 +91,10 @@ namespace shapes {
                     assert(x >= std::numeric_limits<S>::min() && y >= std::numeric_limits<S>::min()
                            && "cast invalid, value to small");
                     assert(static_cast<S>(x) <= std::numeric_limits<S>::max()
-                           && static_cast<S>(y) >= std::numeric_limits<S>::max() && "cast invalid, value to big");
+                           && static_cast<S>(y) <= std::numeric_limits<S>::max() && "cast invalid, value to big");
                 } else {
                     // both are unsigned, so no min check is necessary
-                    assert(x <= std::numeric_limits<S>::max() && y >= std::numeric_limits<S>::max()
+                    assert(x <= std::numeric_limits<S>::max() && y <= std::numeric_limits<S>::max()
                            && "cast invalid, value to big");
                 }
             }
diff --git a/src/libs/core/helper/random.hpp b/src/libs/core/helper/random.hpp
@@ -18,7 +18,7 @@ struct Random {
     OOPETRIS_CORE_EXPORTED Random();
     OOPETRIS_CORE_EXPORTED explicit Random(std::mt19937_64::result_type seed);
 
-    template<utils::integral Integer>
+    template<std::integral Integer>
     [[nodiscard]] Integer random(const Integer upper_bound_exclusive) {
         auto distribution = std::uniform_int_distribution<Integer>{ 0, upper_bound_exclusive - 1 };
         return distribution(m_generator);
diff --git a/src/libs/core/helper/utils.hpp b/src/libs/core/helper/utils.hpp
@@ -6,6 +6,7 @@
 #include <bit>
 #include <cassert>
 #include <climits>
+#include <concepts>
 #include <exception>
 #include <iostream>
 #include <limits>
@@ -26,14 +27,10 @@ namespace helper {
 
 
 namespace utils {
-    // taken from llvm: https://github.com/llvm/llvm-project/blob/main/libcxx/include/__concepts/arithmetic.h#L27-L30
-    // [concepts.arithmetic], arithmetic concepts
-    template<class T>
-    concept integral = std::is_integral_v<T>;
 
-    template<integral Integral>
+    template<std::integral Integral>
     [[nodiscard]] constexpr Integral byte_swap(Integral value) noexcept {
-        // based on source: slartibartswift
+        // Note: based on source: slartibartswift
         auto result = Integral{};
         for (usize i = 0; i < sizeof(Integral); ++i) {
             result <<= CHAR_BIT;
@@ -43,15 +40,15 @@ namespace utils {
         return result;
     }
 
-    [[nodiscard]] constexpr auto to_little_endian(integral auto value) {
+    [[nodiscard]] constexpr auto to_little_endian(std::integral auto value) {
         if constexpr (std::endian::native == std::endian::little) {
             return value;
         } else {
             return byte_swap(value);
         }
     }
 
-    [[nodiscard]] constexpr auto from_little_endian(integral auto value) {
+    [[nodiscard]] constexpr auto from_little_endian(std::integral auto value) {
         return to_little_endian(value);
     }
 
@@ -74,7 +71,7 @@ namespace utils {
     }
 #endif
     template<size_t T>
-    struct size_t_identity {
+    struct SizeIdentity {
         //using type = T;
     };
 
diff --git a/src/libs/recordings/utility/checksum_helper.hpp b/src/libs/recordings/utility/checksum_helper.hpp
@@ -18,7 +18,7 @@ struct Sha256Stream {
 
     Sha256Stream();
 
-    template<utils::integral Integral>
+    template<std::integral Integral>
     Sha256Stream& operator<<(const Integral value) {
 
         library_object.add(
diff --git a/src/libs/recordings/utility/helper.hpp b/src/libs/recordings/utility/helper.hpp
@@ -29,7 +29,7 @@ namespace helper {
         template<typename Result>
         using ReadResult = helper::expected<Result, ReadError>;
 
-        template<utils::integral Integral>
+        template<std::integral Integral>
         [[nodiscard]] ReadResult<std::remove_cv_t<Integral>> read_integral_from_file(std::ifstream& file) {
             if (not file) {
                 return helper::unexpected<ReadError>{
@@ -78,7 +78,7 @@ namespace helper {
             return result;
         }
 
-        template<utils::integral Integral>
+        template<std::integral Integral>
         [[nodiscard]] std::optional<Integral> read_from_istream(std::istream& istream) {
             if (not istream) {
                 return std::nullopt;
@@ -123,7 +123,7 @@ namespace helper {
 
     namespace writer {
 
-        template<utils::integral Integral>
+        template<std::integral Integral>
         helper::expected<void, std::string> write_integral_to_file(std::ofstream& file, const Integral data) {
             if (not file) {
                 return helper::unexpected<std::string>{ fmt::format("failed to write data \"{}\"", data) };
@@ -154,7 +154,7 @@ namespace helper {
         }
 
 
-        template<utils::integral Integral>
+        template<std::integral Integral>
         void append_value(std::vector<char>& vector, const Integral value) {
             const auto little_endian_value = utils::to_little_endian(value);
             const char* const start =
diff --git a/src/libs/recordings/utility/recording_writer.hpp b/src/libs/recordings/utility/recording_writer.hpp
@@ -51,7 +51,7 @@ namespace recorder {
                 const AdditionalInformation& information
         );
 
-        template<utils::integral Integral>
+        template<std::integral Integral>
         helper::expected<void, std::string> write(Integral data) {
             const auto result = helper::writer::write_integral_to_file(m_output_file, data);
             if (not result.has_value()) {
diff --git a/src/scenes/about_page/about_page.cpp b/src/scenes/about_page/about_page.cpp
@@ -67,7 +67,7 @@ namespace scenes {
 
 
             const auto tile_layout_index = m_main_grid.add<ui::TileLayout>(
-                    utils::size_t_identity<2>(), focus_helper.focus_id(), ui::Direction::Horizontal,
+                    utils::SizeIdentity<2>(), focus_helper.focus_id(), ui::Direction::Horizontal,
                     std::array<double, 1>{ 0.85 }, ui::AbsolutMargin{ 0 }, std::pair<double, double>{ 0.05, 0.03 }
             );
 
diff --git a/src/scenes/online_lobby/online_lobby.cpp b/src/scenes/online_lobby/online_lobby.cpp
@@ -19,7 +19,7 @@ namespace scenes {
     OnlineLobby::OnlineLobby(ServiceProvider* service_provider, const ui::Layout& layout)
         : Scene{ service_provider, layout },
           m_main_layout{ 
-                utils::size_t_identity<3>(),
+                utils::SizeIdentity<3>(),
                 0,
                 ui::Direction::Vertical,
                 { 0.1, 0.9 },
diff --git a/src/scenes/recording_selector/recording_component.cpp b/src/scenes/recording_selector/recording_component.cpp
@@ -19,7 +19,7 @@ custom_ui::RecordingComponent::RecordingComponent(
         ):ui::Widget{layout, ui::WidgetType::Component, is_top_level},
         ui::Focusable{focus_helper.focus_id()},
         ui::Hoverable{layout.get_rect()},
-        m_main_layout{ utils::size_t_identity<2>(), focus_helper.focus_id(), 
+        m_main_layout{ utils::SizeIdentity<2>(), focus_helper.focus_id(), 
         ui::Direction::Vertical,
                     std::array<double, 1>{ 0.6 }, ui::RelativeMargin{layout.get_rect(), ui::Direction::Vertical,0.05}, std::pair<double, double>{ 0.05, 0.03 },
                     layout,false
@@ -32,7 +32,7 @@ custom_ui::RecordingComponent::RecordingComponent(
     );
 
     const auto information_layout_index = m_main_layout.add<ui::TileLayout>(
-            utils::size_t_identity<3>(), focus_helper.focus_id(), ui::Direction::Horizontal,
+            utils::SizeIdentity<3>(), focus_helper.focus_id(), ui::Direction::Horizontal,
             std::array<double, 2>{ 0.33, 0.66 }, ui::AbsolutMargin{ 10 }, std::pair<double, double>{ 0.05, 0.03 }
     );
 
diff --git a/src/scenes/recording_selector/recording_selector.cpp b/src/scenes/recording_selector/recording_selector.cpp
@@ -30,7 +30,7 @@ namespace scenes {
     RecordingSelector::RecordingSelector(ServiceProvider* service_provider, const ui::Layout& layout)
         : Scene{ service_provider, layout },
           m_main_layout{ 
-                utils::size_t_identity<3>(),
+                utils::SizeIdentity<3>(),
                 0,
                 ui::Direction::Vertical,
                 { 0.1, 0.9 },
diff --git a/src/scenes/settings_menu/color_setting_row.cpp b/src/scenes/settings_menu/color_setting_row.cpp
@@ -146,7 +146,7 @@ custom_ui::ColorSettingRow::ColorSettingRow(
       ui::Focusable{ focus_id },
       ui::Hoverable{ layout.get_rect() },
       m_service_provider{ service_provider },
-      m_main_layout{ utils::size_t_identity<2>(),
+      m_main_layout{ utils::SizeIdentity<2>(),
                      ui::FocusHelper::focus_id_unused(),
                      ui::Direction::Horizontal,
                      std::array<double, 1>{ 0.7 },
diff --git a/src/scenes/settings_menu/settings_menu.cpp b/src/scenes/settings_menu/settings_menu.cpp
@@ -30,7 +30,7 @@ namespace scenes {
         : SettingsMenu{ service_provider, layout, std::optional<std::shared_ptr<input::GameInput>>{ game_input } } { }
 
     SettingsMenu::SettingsMenu(ServiceProvider* service_provider, const  ui::Layout& layout,  const std::optional<std::shared_ptr<input::GameInput>>& game_input) : Scene{service_provider, layout}
-    , m_main_layout{    utils::size_t_identity<3>(),
+    , m_main_layout{    utils::SizeIdentity<3>(),
     0,
     ui::Direction::Vertical,
                     { 0.1, 0.9 },
diff --git a/src/ui/layouts/tile_layout.hpp b/src/ui/layouts/tile_layout.hpp
@@ -26,10 +26,10 @@ namespace ui {
         std::pair<u32, u32> margin;
 
     public:
-        // see here, why utils::size_t_identity<S> is needed: https://stackoverflow.com/questions/2786946/c-invoke-explicit-template-constructor
+        // see here, why utils::SizeIdentity<S> is needed: https://stackoverflow.com/questions/2786946/c-invoke-explicit-template-constructor
         template<size_t S>
         explicit TileLayout(
-                utils::size_t_identity<S>,
+                utils::SizeIdentity<S>,
                 u32 focus_id,
                 Direction direction,
                 std::array<double, S - 1> steps,
