From df82616df1f897714cd581a3f543a88de84ccc29 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 15 Aug 2025 04:11:04 +0200 Subject: [PATCH] clang-tidy: auto fix headers for DiabloUI --- Source/.clang-tidy | 3 +++ Source/DiabloUI/button.cpp | 9 ++++++++- Source/DiabloUI/credits.cpp | 17 ++++++++++++----- Source/DiabloUI/credits_lines.cpp | 2 ++ Source/DiabloUI/diabloui.cpp | 31 +++++++++++++++++++++---------- Source/DiabloUI/dialogs.cpp | 17 ++++++++++++----- Source/DiabloUI/hero/selhero.cpp | 23 +++++++++++++++++------ Source/DiabloUI/mainmenu.cpp | 12 ++++++++++-- Source/DiabloUI/multi/selconn.cpp | 14 ++++++++++++-- Source/DiabloUI/multi/selgame.cpp | 20 +++++++++++++++++--- Source/DiabloUI/progress.cpp | 11 ++++++++--- Source/DiabloUI/scrollbar.cpp | 3 +++ Source/DiabloUI/selok.cpp | 12 +++++++++++- Source/DiabloUI/selstart.cpp | 11 +++++++++-- Source/DiabloUI/selyesno.cpp | 13 ++++++++++++- Source/DiabloUI/settingsmenu.cpp | 22 ++++++++++++++++++---- Source/DiabloUI/support_lines.cpp | 2 ++ Source/DiabloUI/text_input.cpp | 1 - Source/DiabloUI/title.cpp | 10 +++++++++- 19 files changed, 186 insertions(+), 47 deletions(-) diff --git a/Source/.clang-tidy b/Source/.clang-tidy index 13bc05437..3dfa965a4 100644 --- a/Source/.clang-tidy +++ b/Source/.clang-tidy @@ -92,3 +92,6 @@ CheckOptions: - { key: bugprone-signed-char-misuse.CharTypdefsToIgnore, value: "std::int8_t" } - { key: readability-identifier-length.MinimumLoopCounterNameLength, value: 1 } + + # Ignore warnings for individual SDL headers, e.g. SDL_video.h, SDL_render.h + - { key: misc-include-cleaner.IgnoreHeaders, value: 'SDL_.*\\.h' } diff --git a/Source/DiabloUI/button.cpp b/Source/DiabloUI/button.cpp index f8bc882df..8d4c8c813 100644 --- a/Source/DiabloUI/button.cpp +++ b/Source/DiabloUI/button.cpp @@ -1,12 +1,19 @@ #include "DiabloUI/button.h" +#include + +#include + #include "DiabloUI/diabloui.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "engine/clx_sprite.hpp" #include "engine/load_clx.hpp" #include "engine/load_pcx.hpp" +#include "engine/rectangle.hpp" #include "engine/render/clx_render.hpp" #include "engine/render/text_render.hpp" -#include "utils/display.h" +#include "engine/surface.hpp" namespace devilution { diff --git a/Source/DiabloUI/credits.cpp b/Source/DiabloUI/credits.cpp index 0484894c3..4b873ec63 100644 --- a/Source/DiabloUI/credits.cpp +++ b/Source/DiabloUI/credits.cpp @@ -1,23 +1,30 @@ #include +#include #include -#include +#include +#include +#include #include +#include + #include "DiabloUI/credits_lines.h" #include "DiabloUI/diabloui.h" #include "DiabloUI/support_lines.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" #include "controls/input.h" #include "controls/menu_controls.h" #include "engine/load_clx.hpp" +#include "engine/point.hpp" #include "engine/render/clx_render.hpp" #include "engine/render/text_render.hpp" +#include "engine/surface.hpp" #include "hwcursor.hpp" #include "utils/display.h" #include "utils/is_of.hpp" #include "utils/language.h" -#include "utils/log.hpp" -#include "utils/sdl_compat.h" +#include "utils/sdl_geometry.h" +#include "utils/ui_fwd.h" namespace devilution { @@ -90,7 +97,7 @@ private: void CreditsRenderer::Render() { - const int offsetY = -VIEWPORT.h + (SDL_GetTicks() - ticks_begin_) / 40; + const int offsetY = -VIEWPORT.h + ((SDL_GetTicks() - ticks_begin_) / 40); if (offsetY == prev_offset_y_) return; prev_offset_y_ = offsetY; diff --git a/Source/DiabloUI/credits_lines.cpp b/Source/DiabloUI/credits_lines.cpp index e0b230b88..f2ef9700a 100644 --- a/Source/DiabloUI/credits_lines.cpp +++ b/Source/DiabloUI/credits_lines.cpp @@ -1,3 +1,5 @@ +#include + #include "DiabloUI/credits_lines.h" #include "utils/language.h" diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp index 448f0b8e2..f394e1d50 100644 --- a/Source/DiabloUI/diabloui.cpp +++ b/Source/DiabloUI/diabloui.cpp @@ -1,45 +1,56 @@ #include "DiabloUI/diabloui.h" #include +#include +#include #include #include #include #include +#include +#include + +#include +#include #include "DiabloUI/button.h" -#include "DiabloUI/dialogs.h" #include "DiabloUI/scrollbar.h" #include "DiabloUI/text_input.hpp" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" +#include "appfat.h" #include "controls/control_mode.hpp" #include "controls/controller.h" #include "controls/input.h" #include "controls/menu_controls.h" -#include "controls/plrctrls.h" #include "diablo.h" #include "discord/discord.h" -#include "engine/assets.hpp" +#include "effects.h" #include "engine/clx_sprite.hpp" #include "engine/dx.h" #include "engine/load_pcx.hpp" #include "engine/palette.h" #include "engine/render/clx_render.hpp" #include "engine/render/text_render.hpp" +#include "engine/sound.h" +#include "engine/surface.hpp" #include "engine/ticks.hpp" +#include "headless_mode.hpp" #include "hwcursor.hpp" #include "init.hpp" +#include "options.h" +#include "player.h" +#include "playerdat.hpp" +#include "sound_effect_enums.h" #include "utils/algorithm/container.hpp" #include "utils/display.h" +#include "utils/enum_traits.h" #include "utils/is_of.hpp" -#include "utils/language.h" -#include "utils/log.hpp" -#include "utils/pcx_to_clx.hpp" #include "utils/screen_reader.hpp" #include "utils/sdl_compat.h" #include "utils/sdl_geometry.h" -#include "utils/sdl_ptrs.h" -#include "utils/sdl_wrap.h" #include "utils/str_cat.hpp" -#include "utils/stubs.h" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" #ifdef __SWITCH__ @@ -765,7 +776,7 @@ void DrawSelector(const SDL_Rect &rect) const ClxSprite sprite = sprites[GetAnimationFrame(sprites.numSprites())]; // TODO FOCUS_MED appears higher than the box - const int y = rect.y + (rect.h - static_cast(sprite.height())) / 2; + const int y = rect.y + ((rect.h - static_cast(sprite.height())) / 2); const Surface &out = Surface(DiabloUiSurface()); RenderClxSprite(out, sprite, { rect.x, y }); diff --git a/Source/DiabloUI/dialogs.cpp b/Source/DiabloUI/dialogs.cpp index 2f9bc2f3f..711690182 100644 --- a/Source/DiabloUI/dialogs.cpp +++ b/Source/DiabloUI/dialogs.cpp @@ -1,26 +1,33 @@ #include "DiabloUI/dialogs.h" #include +#include +#include +#include #include -#include +#include + +#include #include "DiabloUI/button.h" #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "controls/input.h" #include "controls/menu_controls.h" #include "engine/clx_sprite.hpp" -#include "engine/dx.h" #include "engine/load_clx.hpp" #include "engine/load_pcx.hpp" -#include "engine/palette.h" +#include "engine/point.hpp" +#include "engine/render/text_render.hpp" #include "headless_mode.hpp" #include "hwcursor.hpp" #include "init.hpp" -#include "utils/display.h" #include "utils/is_of.hpp" #include "utils/language.h" #include "utils/log.hpp" +#include "utils/sdl_geometry.h" +#include "utils/ui_fwd.h" namespace devilution { diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp index 56e750fd5..1f3f5516d 100644 --- a/Source/DiabloUI/hero/selhero.cpp +++ b/Source/DiabloUI/hero/selhero.cpp @@ -1,11 +1,17 @@ #include "DiabloUI/hero/selhero.h" #include -#include +#include #include -#include +#include +#include +#include +#include +#include +#include -#include +#include +#include #include "DiabloUI/diabloui.h" #include "DiabloUI/dialogs.h" @@ -13,16 +19,21 @@ #include "DiabloUI/scrollbar.h" #include "DiabloUI/selok.h" #include "DiabloUI/selyesno.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "controls/control_mode.hpp" -#include "controls/plrctrls.h" #include "engine/assets.hpp" +#include "engine/point.hpp" #include "game_mode.hpp" -#include "menu.h" +#include "levels/gendung.h" #include "options.h" #include "pfile.h" +#include "playerdat.hpp" +#include "utils/enum_traits.h" #include "utils/language.h" +#include "utils/sdl_geometry.h" #include "utils/str_cat.hpp" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/mainmenu.cpp b/Source/DiabloUI/mainmenu.cpp index 23bf9ecd6..3405253f4 100644 --- a/Source/DiabloUI/mainmenu.cpp +++ b/Source/DiabloUI/mainmenu.cpp @@ -1,12 +1,20 @@ +#include #include +#include +#include +#include + +#include #include "DiabloUI/diabloui.h" -#include "DiabloUI/selok.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "engine/assets.hpp" #include "engine/load_clx.hpp" +#include "engine/point.hpp" #include "game_mode.hpp" #include "utils/language.h" +#include "utils/ui_fwd.h" namespace devilution { namespace { diff --git a/Source/DiabloUI/multi/selconn.cpp b/Source/DiabloUI/multi/selconn.cpp index 0c462c80c..65e8d4e50 100644 --- a/Source/DiabloUI/multi/selconn.cpp +++ b/Source/DiabloUI/multi/selconn.cpp @@ -1,11 +1,21 @@ +#include +#include +#include #include +#include -#include +#include +#include #include "DiabloUI/diabloui.h" -#include "stores.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" +#include "engine/point.hpp" +#include "engine/render/text_render.hpp" +#include "multi.h" #include "storm/storm_net.hpp" #include "utils/language.h" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/multi/selgame.cpp b/Source/DiabloUI/multi/selgame.cpp index 2a6a0226c..4955923c4 100644 --- a/Source/DiabloUI/multi/selgame.cpp +++ b/Source/DiabloUI/multi/selgame.cpp @@ -1,21 +1,35 @@ #include "DiabloUI/multi/selgame.h" +#include #include +#include +#include +#include +#include +#include +#include -#include +#include +#include #include "DiabloUI/diabloui.h" -#include "DiabloUI/dialogs.h" #include "DiabloUI/hero/selhero.h" #include "DiabloUI/scrollbar.h" #include "DiabloUI/selok.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "config.h" -#include "control.h" +#include "diablo.h" +#include "engine/point.hpp" +#include "engine/render/text_render.hpp" +#include "levels/gendung.h" #include "menu.h" +#include "multi.h" #include "options.h" #include "storm/storm_net.hpp" #include "utils/language.h" #include "utils/str_cat.hpp" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/progress.cpp b/Source/DiabloUI/progress.cpp index 68c7574b2..a613275be 100644 --- a/Source/DiabloUI/progress.cpp +++ b/Source/DiabloUI/progress.cpp @@ -1,19 +1,24 @@ +#include +#include +#include + #include #include "DiabloUI/button.h" #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_item.h" #include "controls/input.h" #include "controls/menu_controls.h" #include "engine/clx_sprite.hpp" #include "engine/dx.h" #include "engine/load_pcx.hpp" -#include "engine/palette.h" +#include "engine/point.hpp" #include "engine/render/clx_render.hpp" -#include "hwcursor.hpp" +#include "engine/surface.hpp" #include "utils/display.h" #include "utils/is_of.hpp" #include "utils/language.h" +#include "utils/ui_fwd.h" namespace devilution { namespace { diff --git a/Source/DiabloUI/scrollbar.cpp b/Source/DiabloUI/scrollbar.cpp index 7ca5d587b..7f9b07beb 100644 --- a/Source/DiabloUI/scrollbar.cpp +++ b/Source/DiabloUI/scrollbar.cpp @@ -1,5 +1,8 @@ #include "scrollbar.h" +#include + +#include "engine/clx_sprite.hpp" #include "engine/load_pcx.hpp" namespace devilution { diff --git a/Source/DiabloUI/selok.cpp b/Source/DiabloUI/selok.cpp index e367d38be..f75d681e5 100644 --- a/Source/DiabloUI/selok.cpp +++ b/Source/DiabloUI/selok.cpp @@ -1,10 +1,20 @@ #include "DiabloUI/selok.h" +#include +#include +#include +#include + +#include + #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" +#include "engine/point.hpp" #include "engine/render/text_render.hpp" #include "game_mode.hpp" #include "utils/language.h" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/selstart.cpp b/Source/DiabloUI/selstart.cpp index 0e755a1df..feeae52ec 100644 --- a/Source/DiabloUI/selstart.cpp +++ b/Source/DiabloUI/selstart.cpp @@ -1,11 +1,18 @@ #include "selstart.h" +#include +#include +#include +#include + #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "engine/load_clx.hpp" +#include "engine/point.hpp" #include "options.h" #include "utils/language.h" -#include "utils/sdl_geometry.h" +#include "utils/ui_fwd.h" namespace devilution { namespace { diff --git a/Source/DiabloUI/selyesno.cpp b/Source/DiabloUI/selyesno.cpp index a635b7e3a..a524ff72d 100644 --- a/Source/DiabloUI/selyesno.cpp +++ b/Source/DiabloUI/selyesno.cpp @@ -1,8 +1,19 @@ #include "selyesno.h" +#include +#include +#include +#include + +#include + #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" +#include "engine/point.hpp" +#include "engine/render/text_render.hpp" #include "utils/language.h" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/settingsmenu.cpp b/Source/DiabloUI/settingsmenu.cpp index 7f6f24569..54c3e13a1 100644 --- a/Source/DiabloUI/settingsmenu.cpp +++ b/Source/DiabloUI/settingsmenu.cpp @@ -1,24 +1,38 @@ -#include "selstart.h" - +#include +#include +#include #include +#include #include +#include #include +#include #include #include "DiabloUI/diabloui.h" #include "DiabloUI/scrollbar.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" +#include "controls/controller.h" +#include "controls/controller_buttons.h" #include "controls/controller_motion.h" #include "controls/plrctrls.h" #include "controls/remap_keyboard.h" #include "engine/assets.hpp" +#include "engine/rectangle.hpp" #include "engine/render/text_render.hpp" +#include "game_mode.hpp" #include "hwcursor.hpp" +#include "items.h" #include "options.h" -#include "utils/display.h" +#include "utils/enum_traits.h" #include "utils/is_of.hpp" #include "utils/language.h" +#include "utils/sdl_geometry.h" +#include "utils/static_vector.hpp" +#include "utils/str_cat.hpp" +#include "utils/ui_fwd.h" #include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/support_lines.cpp b/Source/DiabloUI/support_lines.cpp index 4c6a87e35..0e0b0bac7 100644 --- a/Source/DiabloUI/support_lines.cpp +++ b/Source/DiabloUI/support_lines.cpp @@ -1,3 +1,5 @@ +#include + #include "DiabloUI/support_lines.h" #include "utils/language.h" diff --git a/Source/DiabloUI/text_input.cpp b/Source/DiabloUI/text_input.cpp index 18f439f4b..6d600e1a5 100644 --- a/Source/DiabloUI/text_input.cpp +++ b/Source/DiabloUI/text_input.cpp @@ -15,7 +15,6 @@ #include "utils/parse_int.hpp" #include "utils/sdl_ptrs.h" #include "utils/str_cat.hpp" -#include "utils/utf8.hpp" namespace devilution { diff --git a/Source/DiabloUI/title.cpp b/Source/DiabloUI/title.cpp index aeaa2b429..02babab0f 100644 --- a/Source/DiabloUI/title.cpp +++ b/Source/DiabloUI/title.cpp @@ -1,15 +1,23 @@ +#include #include +#include + +#include #include "DiabloUI/diabloui.h" -#include "control.h" +#include "DiabloUI/ui_flags.hpp" +#include "DiabloUI/ui_item.h" #include "controls/input.h" #include "controls/menu_controls.h" #include "discord/discord.h" +#include "engine/clx_sprite.hpp" #include "engine/load_clx.hpp" #include "engine/load_pcx.hpp" +#include "engine/point.hpp" #include "utils/algorithm/container.hpp" #include "utils/language.h" #include "utils/sdl_geometry.h" +#include "utils/ui_fwd.h" namespace devilution { namespace {