From 121ed9a8a69000a90f854e7c0d3677a069acbbb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 11 Oct 2026 15:20:28 +0200 Subject: [PATCH] [Tutorial] Fix includes broken by upstream IWYU refactor The master merge replaced several transitive includes with forward declarations; add back the complete types the tutorial code needs: CounterState and PlayerEventHandler in tab_game.cpp, DeckList in visual_deck_editor_widget.cpp, TabDeckEditorVisualTabWidget and VisualDeckEditorWidget in visual_database_display_widget.cpp. --- cockatrice/src/interface/widgets/tabs/tab_game.cpp | 2 ++ .../visual_database_display/visual_database_display_widget.cpp | 2 ++ .../widgets/visual_deck_editor/visual_deck_editor_widget.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index a3c397104..817c171e2 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -3,9 +3,11 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" #include "../../../game/abstract_game.h" +#include "../../../game/board/counter_state.h" #include "../../../game/game_event_handler.h" #include "../../../game/game_meta_info.h" #include "../../../game/game_state.h" +#include "../../../game/player/player_event_handler.h" #include "../../../game/player/player_info.h" #include "../../../game/player/player_manager.h" #include "../../../game_graphics/board/abstract_card_item.h" diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index ecb306e49..312563dc8 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -14,7 +14,9 @@ #include "../general/tutorial/tutorial_controller.h" #include "../quick_settings/settings_button_widget.h" #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h" +#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h" #include "../utility/custom_line_edit.h" +#include "../visual_deck_editor/visual_deck_editor_widget.h" #include "card_database_display_model.h" #include "card_database_model.h" #include "deck_list_model.h" diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 9d7c49e50..de5283062 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include