Refactor: Move files in src/client/game_logic (#6070)

* move abstract_client to src/server

* move key_signals to src/utility

cockatrice/CMakeLists.txt

@@ -7,8 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/client/game_logic/abstract_client.cpp
-    src/client/game_logic/key_signals.cpp
     src/client/get_text_with_max.cpp
     src/client/menus/deck_editor/deck_editor_menu.cpp
     src/client/network/client_update_checker.cpp
@@ -226,6 +224,7 @@ set(cockatrice_SOURCES
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
     src/main.cpp
+    src/server/abstract_client.cpp
     src/server/chat_view/chat_view.cpp
     src/server/handle_public_servers.cpp
     src/server/local_client.cpp
@@ -256,6 +255,7 @@ set(cockatrice_SOURCES
     src/settings/shortcut_treeview.cpp
     src/settings/shortcuts_settings.cpp
     src/utility/card_info_comparator.cpp
+    src/utility/key_signals.cpp
     src/utility/levenshtein.cpp
     src/utility/logger.cpp
     src/utility/sequence_edit.cpp

cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp

@@ -1,6 +1,5 @@
 #include "abstract_tab_deck_editor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tapped_out_interface.h"
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../deck/deck_stats_interface.h"
@@ -9,6 +8,7 @@
 #include "../../dialogs/dlg_load_deck_from_website.h"
 #include "../../game/cards/card_database_manager.h"
 #include "../../game/cards/card_database_model.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
 #include "../ui/picture_loader/picture_loader.h"

cockatrice/src/client/tabs/tab_account.cpp

@@ -1,11 +1,11 @@
 #include "tab_account.h"
 
 #include "../../deck/custom_line_edit.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_info_box.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
-#include "../game_logic/abstract_client.h"
 #include "../sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"

cockatrice/src/client/tabs/tab_admin.cpp

@@ -1,7 +1,7 @@
 #include "tab_admin.h"
 
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/admin_commands.pb.h"
 #include "pb/event_replay_added.pb.h"
 #include "pb/moderator_commands.pb.h"

cockatrice/src/client/tabs/tab_deck_editor.cpp

@@ -1,6 +1,5 @@
 #include "tab_deck_editor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tapped_out_interface.h"
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../dialogs/dlg_load_deck.h"
@@ -9,6 +8,7 @@
 #include "../../game/cards/card_database_model.h"
 #include "../../game/filters/filter_builder.h"
 #include "../../game/filters/filter_tree_model.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
 #include "../menus/deck_editor/deck_editor_menu.h"

cockatrice/src/client/tabs/tab_deck_editor.h

@@ -2,7 +2,7 @@
 #define WINDOW_DECKEDITOR_H
 
 #include "../../game/cards/card_info.h"
-#include "../game_logic/key_signals.h"
+#include "../../utility/key_signals.h"
 #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "abstract_tab_deck_editor.h"
 

cockatrice/src/client/tabs/tab_deck_storage.h

@@ -1,8 +1,8 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
+#include "../../server/abstract_client.h"
 #include "../../server/remote/remote_decklist_tree_widget.h"
-#include "../game_logic/abstract_client.h"
 #include "tab.h"
 
 class ServerInfo_User;

cockatrice/src/client/tabs/tab_game.cpp

@@ -13,11 +13,11 @@
 #include "../../game/player/player_list_widget.h"
 #include "../../game/zones/card_zone.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/message_log_widget.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "../network/replay_timeline_widget.h"
 #include "../ui/line_edit_completer.h"
 #include "../ui/phases_toolbar.h"

cockatrice/src/client/tabs/tab_logs.cpp

@@ -2,8 +2,8 @@
 
 #include "../../deck/custom_line_edit.h"
 #include "../../dialogs/dlg_manage_sets.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_viewlog_history.pb.h"
 #include "trice_limits.h"

cockatrice/src/client/tabs/tab_message.cpp

@@ -2,11 +2,11 @@
 
 #include "../../deck/custom_line_edit.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "../sound_engine.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/serverinfo_user.pb.h"

cockatrice/src/client/tabs/tab_replays.cpp

@@ -1,9 +1,9 @@
 #include "tab_replays.h"
 
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/remote/remote_replay_list_tree_widget.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "pb/command_replay_delete_match.pb.h"
 #include "pb/command_replay_download.pb.h"
 #include "pb/command_replay_modify_match.pb.h"

cockatrice/src/client/tabs/tab_replays.h

@@ -1,7 +1,7 @@
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
-#include "../game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "tab.h"
 
 class ServerInfo_User;

cockatrice/src/client/tabs/tab_room.cpp

@@ -1,9 +1,9 @@
 #include "tab_room.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../dialogs/dlg_settings.h"
 #include "../../game/game_selector.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_manager.h"

cockatrice/src/client/tabs/tab_server.cpp

@@ -1,6 +1,6 @@
 #include "tab_server.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_list_widget.h"
 #include "pb/event_list_rooms.pb.h"

cockatrice/src/client/tabs/tab_supervisor.cpp

@@ -1,7 +1,7 @@
 #include "tab_supervisor.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../main.h"
+#include "../../server/abstract_client.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
 #include "../../settings/cache_settings.h"

cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h

@@ -3,7 +3,7 @@
 
 #include "../../../../deck/custom_line_edit.h"
 #include "../../../../game/cards/card_database_model.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QHBoxLayout>

cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -3,7 +3,7 @@
 
 #include "../../../../deck/custom_line_edit.h"
 #include "../../../../game/cards/card_info.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 

cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h

@@ -1,7 +1,7 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QDockWidget>

cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h

@@ -6,7 +6,7 @@
 #include "../../../../game/cards/card_database.h"
 #include "../../../../game/cards/card_database_model.h"
 #include "../../../../game/filters/filter_tree_model.h"
-#include "../../../game_logic/key_signals.h"
+#include "../../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../../layouts/flow_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"

cockatrice/src/client/ui/window_main.h

@@ -20,7 +20,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "../game_logic/abstract_client.h"
+#include "../../server/abstract_client.h"
 #include "pb/response.pb.h"
 
 #include <QList>

cockatrice/src/game/game_selector.cpp

@@ -1,6 +1,5 @@
 #include "game_selector.h"
 
-#include "../client/game_logic/abstract_client.h"
 #include "../client/get_text_with_max.h"
 #include "../client/tabs/tab_account.h"
 #include "../client/tabs/tab_game.h"
@@ -8,6 +7,7 @@
 #include "../client/tabs/tab_supervisor.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../dialogs/dlg_filter_games.h"
+#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
 #include "games_model.h"

cockatrice/src/game/player/player_list_widget.cpp

@@ -1,10 +1,10 @@
 #include "player_list_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_game.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../client/ui/pixel_map_generator.h"
+#include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"

cockatrice/src/server/abstract_client.cpp

@@ -1,6 +1,5 @@
 #include "abstract_client.h"
 
-#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -18,6 +17,7 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
+#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 

cockatrice/src/server/local_client.h

@@ -1,7 +1,7 @@
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
 
-#include "../client/game_logic/abstract_client.h"
+#include "abstract_client.h"
 
 #include <QLoggingCategory>
 

cockatrice/src/server/remote/remote_client.h

@@ -1,7 +1,7 @@
 #ifndef REMOTECLIENT_H
 #define REMOTECLIENT_H
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "pb/commands.pb.h"
 
 #include <QLoggingCategory>

cockatrice/src/server/remote/remote_decklist_tree_widget.cpp

@@ -1,6 +1,6 @@
 #include "remote_decklist_tree_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/command_deck_list.pb.h"
 #include "pb/response_deck_list.pb.h"

cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp

@@ -1,6 +1,6 @@
 #include "remote_replay_list_tree_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/command_replay_list.pb.h"
 #include "pb/response_replay_list.pb.h"

cockatrice/src/server/user/user_context_menu.cpp

@@ -1,10 +1,10 @@
 #include "user_context_menu.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_game.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../game/game_selector.h"
+#include "../abstract_client.h"
 #include "../chat_view/chat_view.h"
 #include "../pending_command.h"
 #include "pb/command_kick_from_game.pb.h"

cockatrice/src/server/user/user_info_box.cpp

@@ -1,11 +1,11 @@
 #include "user_info_box.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/get_text_with_max.h"
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
 #include "../../dialogs/dlg_edit_user.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "passwordhasher.h"
 #include "pb/response_get_user_info.pb.h"

cockatrice/src/server/user/user_list_manager.cpp

@@ -1,7 +1,7 @@
 #include "user_list_manager.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/sound_engine.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"

cockatrice/src/server/user/user_list_widget.cpp

@@ -1,11 +1,11 @@
 #include "user_list_widget.h"
 
-#include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../game/game_selector.h"
 #include "../../server/user/user_list_manager.h"
+#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_get_games_of_user.pb.h"