[Move refactor] Reparent orphan classes (#6236)

* Move orphaned classes to their correct parent folders.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/tabs/abstract_tab_deck_editor.cpp

@@ -1,7 +1,7 @@
 #include "abstract_tab_deck_editor.h"
 
-#include "../client/tapped_out_interface.h"
-#include "../deck/deck_stats_interface.h"
+#include "../client/network/interfaces/deck_stats_interface.h"
+#include "../client/network/interfaces/tapped_out_interface.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../dialogs/dlg_load_deck_from_website.h"

cockatrice/src/tabs/abstract_tab_deck_editor.h

@@ -1,12 +1,12 @@
 #ifndef TAB_GENERIC_DECK_EDITOR_H
 #define TAB_GENERIC_DECK_EDITOR_H
 
-#include "../client/deck_editor_menu.h"
 #include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
+#include "../interface/widgets/menus/deck_editor_menu.h"
 #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "tab.h"
 

cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp

@@ -1,12 +1,11 @@
 #include "edhrec_deck_api_response.h"
 
-#include "../../../../../deck/deck_loader.h"
-
 #include <QApplication>
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QMainWindow>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {

cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h

@@ -7,13 +7,12 @@
 #ifndef EDHREC_DECK_API_RESPONSE_H
 #define EDHREC_DECK_API_RESPONSE_H
 
-#include "../../../../../deck/deck_loader.h"
-
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 class EdhrecDeckApiResponse
 {

cockatrice/src/tabs/tab_account.cpp

@@ -1,10 +1,10 @@
 #include "tab_account.h"
 
 #include "../client/sound_engine.h"
-#include "../deck/custom_line_edit.h"
-#include "../server/user/user_info_box.h"
-#include "../server/user/user_list_manager.h"
-#include "../server/user/user_list_widget.h"
+#include "../interface/widgets/server/user/user_info_box.h"
+#include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 #include "tab_supervisor.h"
 
 #include <QPushButton>

cockatrice/src/tabs/tab_deck_editor.cpp

@@ -1,7 +1,6 @@
 #include "tab_deck_editor.h"
 
-#include "../client/deck_editor_menu.h"
-#include "../client/tapped_out_interface.h"
+#include "../client/network/interfaces/tapped_out_interface.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../filters/filter_builder.h"
@@ -9,6 +8,7 @@
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
+#include "../interface/widgets/menus/deck_editor_menu.h"
 #include "tab_supervisor.h"
 
 #include <QAction>

cockatrice/src/tabs/tab_deck_storage.cpp

@@ -1,8 +1,7 @@
 #include "tab_deck_storage.h"
 
-#include "../client/get_text_with_max.h"
-#include "../deck/deck_loader.h"
-#include "../server/remote/remote_decklist_tree_widget.h"
+#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
+#include "../interface/widgets/utility/get_text_with_max.h"
 
 #include <QAction>
 #include <QApplication>
@@ -19,6 +18,7 @@
 #include <QUrl>
 #include <QVBoxLayout>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>

cockatrice/src/tabs/tab_deck_storage.h

@@ -8,7 +8,7 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
-#include "../server/remote/remote_decklist_tree_widget.h"
+#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
 #include <libcockatrice/network/client/abstract/abstract_client.h>

cockatrice/src/tabs/tab_game.cpp

@@ -1,6 +1,5 @@
 #include "tab_game.h"
 
-#include "../client/network/replay_timeline_widget.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../game/board/arrow_item.h"
 #include "../game/board/card_item.h"
@@ -16,11 +15,12 @@
 #include "../game/replay.h"
 #include "../game/zones/card_zone.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
-#include "../interface/line_edit_completer.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../interface/widgets/replay/replay_timeline_widget.h"
+#include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/utility/line_edit_completer.h"
 #include "../interface/window_main.h"
 #include "../main.h"
-#include "../server/user/user_list_manager.h"
 #include "tab_supervisor.h"
 
 #include <QAction>

cockatrice/src/tabs/tab_game.h

@@ -9,11 +9,11 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
-#include "../client/replay_manager.h"
 #include "../game/abstract_game.h"
 #include "../game/log/message_log_widget.h"
 #include "../game/player/player.h"
-#include "../interface/tearoff_menu.h"
+#include "../interface/widgets/menus/tearoff_menu.h"
+#include "../interface/widgets/replay/replay_manager.h"
 #include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "tab.h"
 

cockatrice/src/tabs/tab_logs.cpp

@@ -1,7 +1,7 @@
 #include "tab_logs.h"
 
-#include "../deck/custom_line_edit.h"
 #include "../dialogs/dlg_manage_sets.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>

cockatrice/src/tabs/tab_message.cpp

@@ -1,10 +1,10 @@
 #include "tab_message.h"
 
 #include "../client/sound_engine.h"
-#include "../deck/custom_line_edit.h"
+#include "../interface/widgets/server/chat_view/chat_view.h"
+#include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 #include "../main.h"
-#include "../server/chat_view/chat_view.h"
-#include "../server/user/user_list_manager.h"
 
 #include <QApplication>
 #include <QDebug>

cockatrice/src/tabs/tab_replays.cpp

@@ -1,6 +1,6 @@
 #include "tab_replays.h"
 
-#include "../server/remote/remote_replay_list_tree_widget.h"
+#include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
 #include "tab_game.h"
 
 #include <QAction>

cockatrice/src/tabs/tab_room.cpp

@@ -1,11 +1,11 @@
 #include "tab_room.h"
 
 #include "../dialogs/dlg_settings.h"
+#include "../interface/widgets/server/chat_view/chat_view.h"
+#include "../interface/widgets/server/game_selector.h"
+#include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "../server/chat_view/chat_view.h"
-#include "../server/game_selector.h"
-#include "../server/user/user_list_manager.h"
-#include "../server/user/user_list_widget.h"
 #include "tab_account.h"
 #include "tab_supervisor.h"
 

cockatrice/src/tabs/tab_room.h

@@ -8,7 +8,7 @@
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "../interface/line_edit_completer.h"
+#include "../interface/widgets/utility/line_edit_completer.h"
 #include "tab.h"
 
 #include <QFocusEvent>

cockatrice/src/tabs/tab_server.cpp

@@ -1,6 +1,6 @@
 #include "tab_server.h"
 
-#include "../server/user/user_list_widget.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
 #include "tab_supervisor.h"
 
 #include <QCheckBox>

cockatrice/src/tabs/tab_supervisor.cpp

@@ -1,9 +1,9 @@
 #include "tab_supervisor.h"
 
 #include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "../server/user/user_list_manager.h"
-#include "../server/user/user_list_widget.h"
 #include "api/edhrec/tab_edhrec_main.h"
 #include "tab_account.h"
 #include "tab_admin.h"

cockatrice/src/tabs/tab_supervisor.h

@@ -8,8 +8,7 @@
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "../deck/deck_loader.h"
-#include "../server/user/user_list_proxy.h"
+#include "../interface/widgets/server/user/user_list_proxy.h"
 #include "abstract_tab_deck_editor.h"
 #include "api/edhrec/tab_edhrec.h"
 #include "api/edhrec/tab_edhrec_main.h"
@@ -24,6 +23,7 @@
 #include <QMap>
 #include <QProxyStyle>
 #include <QTabWidget>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
 

cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp

@@ -1,7 +1,6 @@
 #include "tab_deck_editor_visual.h"
 
-#include "../../deck/deck_list_model.h"
-#include "../../deck/deck_stats_interface.h"
+#include "../../client/network/interfaces/deck_stats_interface.h"
 #include "../../filters/filter_builder.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/cards/card_info_frame_widget.h"
@@ -29,6 +28,7 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>