From 3a42354efdf13630155e2aba2be73a204d03a8d6 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:47:48 -0300 Subject: [PATCH] Refactor: Move files in src/client/game_logic (#6070) * move abstract_client to src/server * move key_signals to src/utility --- cockatrice/CMakeLists.txt | 4 ++-- cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp | 2 +- cockatrice/src/client/tabs/tab_account.cpp | 2 +- cockatrice/src/client/tabs/tab_admin.cpp | 2 +- cockatrice/src/client/tabs/tab_deck_editor.cpp | 2 +- cockatrice/src/client/tabs/tab_deck_editor.h | 2 +- cockatrice/src/client/tabs/tab_deck_storage.h | 2 +- cockatrice/src/client/tabs/tab_game.cpp | 2 +- cockatrice/src/client/tabs/tab_logs.cpp | 2 +- cockatrice/src/client/tabs/tab_message.cpp | 2 +- cockatrice/src/client/tabs/tab_replays.cpp | 2 +- cockatrice/src/client/tabs/tab_replays.h | 2 +- cockatrice/src/client/tabs/tab_room.cpp | 2 +- cockatrice/src/client/tabs/tab_server.cpp | 2 +- cockatrice/src/client/tabs/tab_supervisor.cpp | 2 +- .../widgets/deck_editor/deck_editor_database_display_widget.h | 2 +- .../ui/widgets/deck_editor/deck_editor_deck_dock_widget.h | 2 +- .../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h | 2 +- .../visual_database_display/visual_database_display_widget.h | 2 +- cockatrice/src/client/ui/window_main.h | 2 +- cockatrice/src/game/game_selector.cpp | 2 +- cockatrice/src/game/player/player_list_widget.cpp | 2 +- .../src/{client/game_logic => server}/abstract_client.cpp | 2 +- .../src/{client/game_logic => server}/abstract_client.h | 0 cockatrice/src/server/local_client.h | 2 +- cockatrice/src/server/remote/remote_client.h | 2 +- cockatrice/src/server/remote/remote_decklist_tree_widget.cpp | 2 +- .../src/server/remote/remote_replay_list_tree_widget.cpp | 2 +- cockatrice/src/server/user/user_context_menu.cpp | 2 +- cockatrice/src/server/user/user_info_box.cpp | 2 +- cockatrice/src/server/user/user_list_manager.cpp | 2 +- cockatrice/src/server/user/user_list_widget.cpp | 2 +- cockatrice/src/{client/game_logic => utility}/key_signals.cpp | 0 cockatrice/src/{client/game_logic => utility}/key_signals.h | 0 34 files changed, 32 insertions(+), 32 deletions(-) rename cockatrice/src/{client/game_logic => server}/abstract_client.cpp (99%) rename cockatrice/src/{client/game_logic => server}/abstract_client.h (100%) rename cockatrice/src/{client/game_logic => utility}/key_signals.cpp (100%) rename cockatrice/src/{client/game_logic => utility}/key_signals.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index f8be8aca5..68fff8a90 100644 --- a/cockatrice/CMakeLists.txt +++ b/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 diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index 68de8bdac..ce88a75c4 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_account.cpp b/cockatrice/src/client/tabs/tab_account.cpp index 78517a82d..09261b63f 100644 --- a/cockatrice/src/client/tabs/tab_account.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_admin.cpp b/cockatrice/src/client/tabs/tab_admin.cpp index 5a8ace0c6..3a46441bd 100644 --- a/cockatrice/src/client/tabs/tab_admin.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp index 45762a76a..9908225d1 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_deck_editor.h b/cockatrice/src/client/tabs/tab_deck_editor.h index 710689b8e..c5a7f5302 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.h +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_deck_storage.h b/cockatrice/src/client/tabs/tab_deck_storage.h index e207a1187..45c6d9a82 100644 --- a/cockatrice/src/client/tabs/tab_deck_storage.h +++ b/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; diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index f96949074..bfe9f5244 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_logs.cpp b/cockatrice/src/client/tabs/tab_logs.cpp index 0f75b4c74..cf289b2ed 100644 --- a/cockatrice/src/client/tabs/tab_logs.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_message.cpp b/cockatrice/src/client/tabs/tab_message.cpp index 06700d4e3..12b52528e 100644 --- a/cockatrice/src/client/tabs/tab_message.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_replays.cpp b/cockatrice/src/client/tabs/tab_replays.cpp index 123c3d3fc..b926603f2 100644 --- a/cockatrice/src/client/tabs/tab_replays.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_replays.h b/cockatrice/src/client/tabs/tab_replays.h index 7014a7f6e..03de9be52 100644 --- a/cockatrice/src/client/tabs/tab_replays.h +++ b/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; diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp index 569a88094..117673743 100644 --- a/cockatrice/src/client/tabs/tab_room.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_server.cpp b/cockatrice/src/client/tabs/tab_server.cpp index 24c3e7839..989e98131 100644 --- a/cockatrice/src/client/tabs/tab_server.cpp +++ b/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" diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index d87cb4744..feb989fbf 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/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" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h index 053929bef..4e8711b30 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/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 diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h index 0530b87a0..b81bf6096 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/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" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h index 9cd8d8d6f..46d7f5de1 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/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 diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h index 9b729069f..eb30bd88f 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/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" diff --git a/cockatrice/src/client/ui/window_main.h b/cockatrice/src/client/ui/window_main.h index 420aac214..76901c9d4 100644 --- a/cockatrice/src/client/ui/window_main.h +++ b/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 diff --git a/cockatrice/src/game/game_selector.cpp b/cockatrice/src/game/game_selector.cpp index 8b71fe187..5c3e287e6 100644 --- a/cockatrice/src/game/game_selector.cpp +++ b/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" diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index a5901c392..dc7489dce 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/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" diff --git a/cockatrice/src/client/game_logic/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp similarity index 99% rename from cockatrice/src/client/game_logic/abstract_client.cpp rename to cockatrice/src/server/abstract_client.cpp index bc227bf68..4f3098871 100644 --- a/cockatrice/src/client/game_logic/abstract_client.cpp +++ b/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 diff --git a/cockatrice/src/client/game_logic/abstract_client.h b/cockatrice/src/server/abstract_client.h similarity index 100% rename from cockatrice/src/client/game_logic/abstract_client.h rename to cockatrice/src/server/abstract_client.h diff --git a/cockatrice/src/server/local_client.h b/cockatrice/src/server/local_client.h index 679d43f2b..145887ea8 100644 --- a/cockatrice/src/server/local_client.h +++ b/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 diff --git a/cockatrice/src/server/remote/remote_client.h b/cockatrice/src/server/remote/remote_client.h index f34fdb71b..0ab24c798 100644 --- a/cockatrice/src/server/remote/remote_client.h +++ b/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 diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp index 0e6872646..dfed741f9 100644 --- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp +++ b/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" diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp index 953d1e6af..1fa72b20c 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp +++ b/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" diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index a33b31632..86fa4a8bf 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/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" diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index 39babbf50..65868927f 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/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" diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp index 6cf0c763d..c74706955 100644 --- a/cockatrice/src/server/user/user_list_manager.cpp +++ b/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" diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index b1bc4dab7..b960d86ca 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/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" diff --git a/cockatrice/src/client/game_logic/key_signals.cpp b/cockatrice/src/utility/key_signals.cpp similarity index 100% rename from cockatrice/src/client/game_logic/key_signals.cpp rename to cockatrice/src/utility/key_signals.cpp diff --git a/cockatrice/src/client/game_logic/key_signals.h b/cockatrice/src/utility/key_signals.h similarity index 100% rename from cockatrice/src/client/game_logic/key_signals.h rename to cockatrice/src/utility/key_signals.h