From 5414e3e3b55e426b2072091e5d6b934c84a36d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 8 Oct 2025 13:17:56 +0200 Subject: [PATCH] Move abstract client. Took 2 minutes --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/game/game_event_handler.cpp | 2 +- cockatrice/src/game/game_state.h | 2 +- .../src/game/player/player_list_widget.cpp | 2 +- .../interface/widgets/general/home_widget.h | 2 +- cockatrice/src/interface/window_main.h | 2 +- cockatrice/src/server/game_selector.cpp | 2 +- .../remote/remote_decklist_tree_widget.cpp | 2 +- .../remote/remote_replay_list_tree_widget.cpp | 2 +- .../src/server/user/user_context_menu.cpp | 2 +- cockatrice/src/server/user/user_info_box.cpp | 2 +- .../src/server/user/user_list_manager.cpp | 2 +- .../src/server/user/user_list_widget.cpp | 2 +- .../src/tabs/abstract_tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab_account.cpp | 2 +- cockatrice/src/tabs/tab_admin.cpp | 2 +- cockatrice/src/tabs/tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab_deck_storage.h | 2 +- cockatrice/src/tabs/tab_game.cpp | 2 +- cockatrice/src/tabs/tab_home.h | 2 +- cockatrice/src/tabs/tab_logs.cpp | 2 +- cockatrice/src/tabs/tab_message.cpp | 2 +- cockatrice/src/tabs/tab_replays.cpp | 2 +- cockatrice/src/tabs/tab_replays.h | 2 +- cockatrice/src/tabs/tab_room.cpp | 2 +- cockatrice/src/tabs/tab_server.cpp | 2 +- cockatrice/src/tabs/tab_supervisor.cpp | 2 +- .../libcockatrice/client/CMakeLists.txt | 6 ++-- .../client/abstract/CMakeLists.txt | 31 +++++++++++++++++++ .../client/{ => abstract}/abstract_client.cpp | 2 +- .../client/{ => abstract}/abstract_client.h | 0 .../libcockatrice/client/local/local_client.h | 2 +- .../client/remote/remote_client.h | 2 +- 33 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt rename libcockatrice_network/libcockatrice/client/{ => abstract}/abstract_client.cpp (99%) rename libcockatrice_network/libcockatrice/client/{ => abstract}/abstract_client.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index d762ef0a3..96d85584c 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -205,7 +205,7 @@ set(cockatrice_SOURCES src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/interface/window_main.cpp src/main.cpp - ../libcockatrice_network/libcockatrice/client/abstract_client.cpp + ../libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp src/server/chat_view/chat_view.cpp src/server/game_selector.cpp src/server/games_model.cpp diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index fced4f0c5..649ad9237 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,6 +1,6 @@ #include "game_event_handler.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../server/pending_command.h" #include "../tabs/tab_game.h" #include "abstract_game.h" diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h index 4fce3de97..574743d05 100644 --- a/cockatrice/src/game/game_state.h +++ b/cockatrice/src/game/game_state.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_GAME_STATE_H #define COCKATRICE_GAME_STATE_H -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include #include diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index 0a96ccca1..aa31f4251 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -1,6 +1,6 @@ #include "player_list_widget.h" -#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../interface/pixel_map_generator.h" #include "../../server/user/user_context_menu.h" #include "../../server/user/user_list_manager.h" diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h index 47e00cd3f..e713575a0 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -7,7 +7,7 @@ #ifndef HOME_WIDGET_H #define HOME_WIDGET_H -#include "../../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../../tabs/tab_supervisor.h" #include "../cards/card_info_picture_art_crop_widget.h" #include "home_styled_button.h" diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 2e1f6b7ff..5d9a874f4 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -25,7 +25,7 @@ #ifndef WINDOW_H #define WINDOW_H -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include #include diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp index d449a4f10..76b85254d 100644 --- a/cockatrice/src/server/game_selector.cpp +++ b/cockatrice/src/server/game_selector.cpp @@ -1,6 +1,6 @@ #include "game_selector.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/get_text_with_max.h" #include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_filter_games.h" diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp index 73b97786e..f77d6f7e8 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 "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../pending_command.h" #include 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 7e971680a..06820cf0f 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 "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../pending_command.h" #include diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index 154184184..feed044c2 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/cockatrice/src/server/user/user_context_menu.cpp @@ -1,6 +1,6 @@ #include "user_context_menu.h" -#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../tabs/tab_account.h" #include "../../tabs/tab_game.h" #include "../../tabs/tab_supervisor.h" diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index 1ac55f805..4cabd2c23 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -1,6 +1,6 @@ #include "user_info_box.h" -#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../client/get_text_with_max.h" #include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_password.h" diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp index 0ea1bea16..7e1eb38ae 100644 --- a/cockatrice/src/server/user/user_list_manager.cpp +++ b/cockatrice/src/server/user/user_list_manager.cpp @@ -1,6 +1,6 @@ #include "user_list_manager.h" -#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../client/sound_engine.h" #include "../pending_command.h" #include "user_info_box.h" diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index 191fbcc65..605d73b97 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -1,6 +1,6 @@ #include "user_list_widget.h" -#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../../interface/pixel_map_generator.h" #include "../../tabs/tab_account.h" #include "../../tabs/tab_supervisor.h" diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index 4972efe43..9c5246583 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,6 +1,6 @@ #include "abstract_tab_deck_editor.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/tapped_out_interface.h" #include "../deck/deck_stats_interface.h" #include "../dialogs/dlg_load_deck.h" diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index 4ddb48a87..a1e81fc43 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -1,6 +1,6 @@ #include "tab_account.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" #include "../server/pending_command.h" diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp index 5d3143a5b..887ab0007 100644 --- a/cockatrice/src/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -1,6 +1,6 @@ #include "tab_admin.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../server/pending_command.h" #include diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index fd5ad826b..33dbc9e8e 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -1,6 +1,6 @@ #include "tab_deck_editor.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/deck_editor_menu.h" #include "../client/tapped_out_interface.h" #include "../dialogs/dlg_load_deck.h" diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h index 4da7f8fa4..8582fd78f 100644 --- a/cockatrice/src/tabs/tab_deck_storage.h +++ b/cockatrice/src/tabs/tab_deck_storage.h @@ -8,7 +8,7 @@ #ifndef TAB_DECK_STORAGE_H #define TAB_DECK_STORAGE_H -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../server/remote/remote_decklist_tree_widget.h" #include "tab.h" diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index 37311a3c9..47dbdb669 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -1,6 +1,6 @@ #include "tab_game.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/network/replay_timeline_widget.h" #include "../dialogs/dlg_create_game.h" #include "../game/board/arrow_item.h" diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h index 84cea8c8f..5efe9e57a 100644 --- a/cockatrice/src/tabs/tab_home.h +++ b/cockatrice/src/tabs/tab_home.h @@ -7,7 +7,7 @@ #ifndef TAB_HOME_H #define TAB_HOME_H -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../interface/widgets/general/home_widget.h" #include "tab.h" diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index b82101933..b5e593b76 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -1,6 +1,6 @@ #include "tab_logs.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../deck/custom_line_edit.h" #include "../dialogs/dlg_manage_sets.h" #include "../server/pending_command.h" diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 8b11ec274..4a064bc38 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -1,6 +1,6 @@ #include "tab_message.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" #include "../main.h" diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index 6c2e6f574..f758d2fd1 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -1,6 +1,6 @@ #include "tab_replays.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../server/pending_command.h" #include "../server/remote/remote_replay_list_tree_widget.h" #include "tab_game.h" diff --git a/cockatrice/src/tabs/tab_replays.h b/cockatrice/src/tabs/tab_replays.h index 1035cec2f..319e9301c 100644 --- a/cockatrice/src/tabs/tab_replays.h +++ b/cockatrice/src/tabs/tab_replays.h @@ -8,7 +8,7 @@ #ifndef TAB_REPLAYS_H #define TAB_REPLAYS_H -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "tab.h" class ServerInfo_User; diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index d8932d467..117f6a0fc 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -1,6 +1,6 @@ #include "tab_room.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../dialogs/dlg_settings.h" #include "../main.h" #include "../server/chat_view/chat_view.h" diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp index 5e50285b2..23bcc23c2 100644 --- a/cockatrice/src/tabs/tab_server.cpp +++ b/cockatrice/src/tabs/tab_server.cpp @@ -1,6 +1,6 @@ #include "tab_server.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../server/pending_command.h" #include "../server/user/user_list_widget.h" #include "tab_supervisor.h" diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp index 44352f6f4..d2e630b60 100644 --- a/cockatrice/src/tabs/tab_supervisor.cpp +++ b/cockatrice/src/tabs/tab_supervisor.cpp @@ -1,6 +1,6 @@ #include "tab_supervisor.h" -#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h" +#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h" #include "../interface/pixel_map_generator.h" #include "../main.h" #include "../server/user/user_list_manager.h" diff --git a/libcockatrice_network/libcockatrice/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/CMakeLists.txt index 05d8e9021..411b024c1 100644 --- a/libcockatrice_network/libcockatrice/client/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/client/CMakeLists.txt @@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - local_client.h + abstract/abstract_client.h ) set(SOURCES - local_client.cpp + abstract/abstract_client.cpp ) if (Qt6_FOUND) @@ -17,7 +17,7 @@ elseif (Qt5_FOUND) endif () add_library( - libcockatrice_network_client_local STATIC + libcockatrice_network_client STATIC ${MOC_SOURCES} ${SOURCES} ) diff --git a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt new file mode 100644 index 000000000..05d8e9021 --- /dev/null +++ b/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt @@ -0,0 +1,31 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + local_client.h +) + +set(SOURCES + local_client.cpp +) + +if (Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif (Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif () + +add_library( + libcockatrice_network_client_local STATIC + ${MOC_SOURCES} + ${SOURCES} +) + +# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) + +target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries( + libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} +) diff --git a/libcockatrice_network/libcockatrice/client/abstract_client.cpp b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp similarity index 99% rename from libcockatrice_network/libcockatrice/client/abstract_client.cpp rename to libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp index 1b594a779..30f3281b2 100644 --- a/libcockatrice_network/libcockatrice/client/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp @@ -1,6 +1,6 @@ #include "../../../cockatrice/src/server/abstract_client.h" -#include "../../../cockatrice/src/server/pending_command.h" +#include "../../../../cockatrice/src/server/pending_command.h" #include #include diff --git a/libcockatrice_network/libcockatrice/client/abstract_client.h b/libcockatrice_network/libcockatrice/client/abstract/abstract_client.h similarity index 100% rename from libcockatrice_network/libcockatrice/client/abstract_client.h rename to libcockatrice_network/libcockatrice/client/abstract/abstract_client.h diff --git a/libcockatrice_network/libcockatrice/client/local/local_client.h b/libcockatrice_network/libcockatrice/client/local/local_client.h index 871c953dc..e8c5330ac 100644 --- a/libcockatrice_network/libcockatrice/client/local/local_client.h +++ b/libcockatrice_network/libcockatrice/client/local/local_client.h @@ -7,7 +7,7 @@ #ifndef LOCALCLIENT_H #define LOCALCLIENT_H -#include "../abstract_client.h" +#include "../abstract/abstract_client.h" #include diff --git a/libcockatrice_network/libcockatrice/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/client/remote/remote_client.h index f6b019af2..d3984d5dd 100644 --- a/libcockatrice_network/libcockatrice/client/remote/remote_client.h +++ b/libcockatrice_network/libcockatrice/client/remote/remote_client.h @@ -7,7 +7,7 @@ #ifndef REMOTECLIENT_H #define REMOTECLIENT_H -#include "../abstract_client.h" +#include "../abstract/abstract_client.h" #include #include