From 5e18e65b3942bc8d96f44095f70044d14469a38d Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Mon, 13 Jan 2025 22:30:22 -0800
Subject: [PATCH] move deck_view_container to src/game/deckview

---
 cockatrice/CMakeLists.txt                          |  3 +--
 cockatrice/src/client/tabs/tab_game.cpp            |  2 +-
 .../tabs => game/deckview}/deck_view_container.cpp | 14 ++++++--------
 .../tabs => game/deckview}/deck_view_container.h   |  0
 4 files changed, 8 insertions(+), 11 deletions(-)
 rename cockatrice/src/{client/tabs => game/deckview}/deck_view_container.cpp (97%)
 rename cockatrice/src/{client/tabs => game/deckview}/deck_view_container.h (100%)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 8db71ddb4..73b835bdd 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -57,6 +57,7 @@ set(cockatrice_SOURCES
     src/dialogs/dlg_view_log.cpp
     src/dialogs/dlg_load_deck.cpp
     src/game/deckview/deck_view.cpp
+    src/game/deckview/deck_view_container.cpp
     src/game/filters/filter_string.cpp
     src/game/filters/filter_builder.cpp
     src/game/filters/filter_tree.cpp
@@ -149,8 +150,6 @@ set(cockatrice_SOURCES
     src/client/tabs/tab_room.cpp
     src/client/tabs/tab_server.cpp
     src/client/tabs/tab_supervisor.cpp
-    src/client/tabs/deck_view_container.cpp
-    src/client/tabs/deck_view_container.h
     src/game/zones/table_zone.cpp
     src/client/tapped_out_interface.cpp
     src/client/ui/theme_manager.cpp
diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index 8b8887084..919880603 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -6,6 +6,7 @@
 #include "../../game/cards/card_database.h"
 #include "../../game/cards/card_database_manager.h"
 #include "../../game/cards/card_item.h"
+#include "../../game/deckview/deck_view_container.h"
 #include "../../game/game_scene.h"
 #include "../../game/game_view.h"
 #include "../../game/player/player.h"
@@ -21,7 +22,6 @@
 #include "../ui/phases_toolbar.h"
 #include "../ui/picture_loader/picture_loader.h"
 #include "../ui/window_main.h"
-#include "./deck_view_container.h"
 #include "get_pb_extension.h"
 #include "pb/command_concede.pb.h"
 #include "pb/command_delete_arrow.pb.h"
diff --git a/cockatrice/src/client/tabs/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp
similarity index 97%
rename from cockatrice/src/client/tabs/deck_view_container.cpp
rename to cockatrice/src/game/deckview/deck_view_container.cpp
index e14cc4000..bcea3bba1 100644
--- a/cockatrice/src/client/tabs/deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/deck_view_container.cpp
@@ -1,23 +1,21 @@
 #include "deck_view_container.h"
 
+#include "../../client/tabs/tab_game.h"
+#include "../../client/ui/picture_loader/picture_loader.h"
 #include "../../deck/deck_loader.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"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
-#include "../ui/picture_loader.h"
+#include "../cards/card_database.h"
+#include "../cards/card_database_manager.h"
+#include "../game_scene.h"
+#include "deck_view.h"
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_ready_start.pb.h"
 #include "pb/command_set_sideboard_lock.pb.h"
 #include "pb/command_set_sideboard_plan.pb.h"
 #include "pb/response_deck_download.pb.h"
-#include "tab_game.h"
 #include "trice_limits.h"
 
 #include <QMessageBox>
diff --git a/cockatrice/src/client/tabs/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h
similarity index 100%
rename from cockatrice/src/client/tabs/deck_view_container.h
rename to cockatrice/src/game/deckview/deck_view_container.h