From ed3e627b6635f5a9210b350499b6c6fefc27a4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 8 Oct 2025 21:58:55 +0200 Subject: [PATCH] Fix some relative imports. Took 32 minutes --- cockatrice/src/filters/deck_filter_string.cpp | 2 +- cockatrice/src/filters/filter_string.cpp | 2 +- cockatrice/src/game/deckview/deck_view_container.cpp | 2 +- cockatrice/src/game/zones/view_zone.cpp | 4 ++-- cockatrice/src/main.cpp | 2 +- .../src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index 44ef6c2bd..4d5266c38 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,6 +1,6 @@ #include "deck_filter_string.h" -#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" +#include #include "filter_string.h" #include diff --git a/cockatrice/src/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp index 9a9cc080e..fab359d9c 100644 --- a/cockatrice/src/filters/filter_string.cpp +++ b/cockatrice/src/filters/filter_string.cpp @@ -1,6 +1,6 @@ #include "filter_string.h" -#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" +#include #include #include diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index a2b5ee4d7..22402ee63 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,6 +1,5 @@ #include "deck_view_container.h" -#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../deck/deck_loader.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" @@ -22,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 521714760..b57689447 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,6 +1,5 @@ #include "view_zone.h" -#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" @@ -16,6 +15,7 @@ #include #include #include +#include /** * @param parent the parent QGraphicsWidget containing the reveal zone @@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) qobject_cast(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE); reorganizeCards(); - emit getLogic()->cardCountChanged(); + emit getLogic() -> cardCountChanged(); } // Because of boundingRect(), this function must not be called before the zone was added to a scene. diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 086c3ab70..e61d60b3d 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -29,7 +29,7 @@ #include "interface/window_main.h" #include "version_string.h" -#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h> +#include #include #include #include diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index dd67a1ae3..15eb54a20 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,6 +1,5 @@ #include "tab_deck_editor_visual.h" -#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h" #include "../../deck/deck_list_model.h" #include "../../deck/deck_stats_interface.h" #include "../../filters/filter_builder.h" @@ -31,6 +30,7 @@ #include #include #include +#include #include #include