From b0296d00fcf231f1eafbc6f4ac299239cd53d630 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 13 Jan 2025 19:59:12 -0800 Subject: [PATCH] move deck_view into src/game/deckview --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/client/tabs/deck_view_container.cpp | 2 +- cockatrice/src/{deck => game/deckview}/deck_view.cpp | 8 +++----- cockatrice/src/{deck => game/deckview}/deck_view.h | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) rename cockatrice/src/{deck => game/deckview}/deck_view.cpp (99%) rename cockatrice/src/{deck => game/deckview}/deck_view.h (98%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 25a18e1ac..8db71ddb4 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -34,7 +34,6 @@ set(cockatrice_SOURCES src/deck/deck_loader.cpp src/deck/deck_list_model.cpp src/deck/deck_stats_interface.cpp - src/deck/deck_view.cpp src/dialogs/dlg_connect.cpp src/dialogs/dlg_create_token.cpp src/dialogs/dlg_create_game.cpp @@ -57,6 +56,7 @@ set(cockatrice_SOURCES src/dialogs/dlg_update.cpp src/dialogs/dlg_view_log.cpp src/dialogs/dlg_load_deck.cpp + src/game/deckview/deck_view.cpp src/game/filters/filter_string.cpp src/game/filters/filter_builder.cpp src/game/filters/filter_tree.cpp diff --git a/cockatrice/src/client/tabs/deck_view_container.cpp b/cockatrice/src/client/tabs/deck_view_container.cpp index 7e1b17e7f..e14cc4000 100644 --- a/cockatrice/src/client/tabs/deck_view_container.cpp +++ b/cockatrice/src/client/tabs/deck_view_container.cpp @@ -1,11 +1,11 @@ #include "deck_view_container.h" #include "../../deck/deck_loader.h" -#include "../../deck/deck_view.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_remote_deck.h" #include "../../game/cards/card_database.h" #include "../../game/cards/card_database_manager.h" +#include "../../game/deckview/deck_view.h" #include "../../game/game_scene.h" #include "../../game/game_view.h" #include "../../server/pending_command.h" diff --git a/cockatrice/src/deck/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp similarity index 99% rename from cockatrice/src/deck/deck_view.cpp rename to cockatrice/src/game/deckview/deck_view.cpp index fff52fd49..241a07395 100644 --- a/cockatrice/src/deck/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,15 +1,13 @@ #include "deck_view.h" -#include "../client/ui/theme_manager.h" -#include "../game/cards/card_database.h" -#include "../main.h" -#include "../settings/cache_settings.h" +#include "../../client/ui/theme_manager.h" +#include "../../game/cards/card_database.h" +#include "../../settings/cache_settings.h" #include "decklist.h" #include #include #include -#include #include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, diff --git a/cockatrice/src/deck/deck_view.h b/cockatrice/src/game/deckview/deck_view.h similarity index 98% rename from cockatrice/src/deck/deck_view.h rename to cockatrice/src/game/deckview/deck_view.h index 88bbfdf39..9026c64cf 100644 --- a/cockatrice/src/deck/deck_view.h +++ b/cockatrice/src/game/deckview/deck_view.h @@ -1,7 +1,7 @@ #ifndef DECKVIEW_H #define DECKVIEW_H -#include "../game/cards/abstract_card_drag_item.h" +#include "../../game/cards/abstract_card_drag_item.h" #include "pb/move_card_to_zone.pb.h" #include