Move abstract client.

Took 2 minutes

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

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"

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 <QObject>
 #include <QTimer>

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"

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"

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 <QList>
 #include <QLoggingCategory>

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"

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 <QFileIconProvider>

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 <QFileIconProvider>

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"

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"

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"

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"

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"

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"

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 <QDialogButtonBox>

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"

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"
 

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"

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"
 

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"

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"

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"

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;

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"

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"

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"

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}
 )

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}
+)

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 <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>

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 <QLoggingCategory>
 

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 <QLoggingCategory>
 #include <QTcpSocket>