[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/CMakeLists.txt

@@ -7,22 +7,14 @@ 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/deck_editor_menu.cpp
-    src/client/get_text_with_max.cpp
-    src/client/network/client_update_checker.cpp
+    src/client/network/update/client/update_downloader.cpp
+    src/client/network/interfaces/deck_stats_interface.cpp
+    src/client/network/interfaces/tapped_out_interface.cpp
     src/client/network/parsers/deck_link_to_api_transformer.cpp
-    src/client/network/release_channel.cpp
-    src/client/network/replay_timeline_widget.cpp
-    src/client/network/sets_model.cpp
-    src/client/network/spoiler_background_updater.cpp
-    src/client/replay_manager.cpp
+    src/client/network/update/client/client_update_checker.cpp
+    src/client/network/update/client/release_channel.cpp
+    src/client/network/update/card_spoiler/spoiler_background_updater.cpp
     src/client/sound_engine.cpp
-    src/client/tapped_out_interface.cpp
-    src/client/update_downloader.cpp
-    src/deck/custom_line_edit.cpp
-    src/deck/deck_list_model.cpp
-    src/deck/deck_loader.cpp
-    src/deck/deck_stats_interface.cpp
     src/dialogs/dlg_connect.cpp
     src/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/dialogs/dlg_create_game.cpp
@@ -128,7 +120,7 @@ set(cockatrice_SOURCES
     src/interface/card_picture_loader/card_picture_to_load.cpp
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
-    src/interface/line_edit_completer.cpp
+    src/interface/widgets/utility/line_edit_completer.cpp
     src/interface/pixel_map_generator.cpp
     src/interface/theme_manager.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -169,6 +161,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/general/layout_containers/flow_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_widget.cpp
+    src/interface/widgets/menus/deck_editor_menu.cpp
     src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
     src/interface/widgets/printing_selector/card_amount_widget.cpp
     src/interface/widgets/printing_selector/printing_selector.cpp
@@ -180,6 +173,22 @@ set(cockatrice_SOURCES
     src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
     src/interface/widgets/quick_settings/settings_button_widget.cpp
     src/interface/widgets/quick_settings/settings_popup_widget.cpp
+    src/interface/widgets/replay/replay_manager.cpp
+    src/interface/widgets/replay/replay_timeline_widget.cpp
+    src/interface/widgets/server/chat_view/chat_view.cpp
+    src/interface/widgets/server/game_selector.cpp
+    src/interface/widgets/server/games_model.cpp
+    src/interface/widgets/server/handle_public_servers.cpp
+    src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+    src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+    src/interface/widgets/server/user/user_context_menu.cpp
+    src/interface/widgets/server/user/user_info_box.cpp
+    src/interface/widgets/server/user/user_info_connection.cpp
+    src/interface/widgets/server/user/user_list_manager.cpp
+    src/interface/widgets/server/user/user_list_widget.cpp
+    src/interface/widgets/utility/custom_line_edit.cpp
+    src/interface/widgets/utility/get_text_with_max.cpp
+    src/interface/widgets/utility/sequence_edit.cpp
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
@@ -205,17 +214,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/server/chat_view/chat_view.cpp
-    src/server/game_selector.cpp
-    src/server/games_model.cpp
-    src/server/handle_public_servers.cpp
-    src/server/remote/remote_decklist_tree_widget.cpp
-    src/server/remote/remote_replay_list_tree_widget.cpp
-    src/server/user/user_context_menu.cpp
-    src/server/user/user_info_box.cpp
-    src/server/user/user_info_connection.cpp
-    src/server/user/user_list_manager.cpp
-    src/server/user/user_list_widget.cpp
     src/tabs/abstract_tab_deck_editor.cpp
     src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@@ -260,8 +258,6 @@ set(cockatrice_SOURCES
     src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
     src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
     src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/interface/utility/deck_list_sort_filter_proxy_model.cpp
-    src/interface/utility/sequence_edit.cpp
 )
 
 add_subdirectory(sounds)

cockatrice/src/client/network/parsers/interface_json_deck_parser.h

@@ -6,10 +6,9 @@
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-#include "../../../deck/deck_loader.h"
-
 #include <QJsonArray>
 #include <QJsonObject>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 class IJsonDeckParser
 {

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -1,7 +1,7 @@
 #include "spoiler_background_updater.h"
 
-#include "../../interface/window_main.h"
-#include "../../main.h"
+#include "../../../../interface/window_main.h"
+#include "../../../../main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>

cockatrice/src/dialogs/dlg_connect.h

@@ -7,8 +7,8 @@
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
-#include "../server/handle_public_servers.h"
-#include "../server/user/user_info_connection.h"
+#include "../interface/widgets/server/handle_public_servers.h"
+#include "../interface/widgets/server/user/user_info_connection.h"
 
 #include <QDialog>
 #include <QLineEdit>

cockatrice/src/dialogs/dlg_edit_tokens.cpp

@@ -1,6 +1,6 @@
 #include "dlg_edit_tokens.h"
 
-#include "../client/get_text_with_max.h"
+#include "../interface/widgets/utility/get_text_with_max.h"
 #include "../main.h"
 
 #include <QAction>

cockatrice/src/dialogs/dlg_filter_games.h

@@ -7,7 +7,7 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../server/games_model.h"
+#include "../interface/widgets/server/games_model.h"
 
 #include <QCheckBox>
 #include <QComboBox>

cockatrice/src/dialogs/dlg_load_deck.cpp

@@ -1,7 +1,6 @@
 #include "dlg_load_deck.h"
 
-#include "../deck/deck_loader.h"
-
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))

cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp

@@ -1,6 +1,5 @@
 #include "dlg_load_deck_from_clipboard.h"
 
-#include "../deck/deck_loader.h"
 #include "dlg_settings.h"
 
 #include <QApplication>
@@ -12,6 +11,7 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 /**

cockatrice/src/dialogs/dlg_load_remote_deck.cpp

@@ -1,7 +1,7 @@
 #include "dlg_load_remote_deck.h"
 
+#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../main.h"
-#include "../server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
 #include <QHBoxLayout>

cockatrice/src/dialogs/dlg_manage_sets.cpp

@@ -1,8 +1,7 @@
 #include "dlg_manage_sets.h"
 
-#include "../client/network/sets_model.h"
-#include "../deck/custom_line_edit.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 #include "../main.h"
 
 #include <QAction>
@@ -21,6 +20,7 @@
 #include <QTreeView>
 #include <algorithm>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/card_database/model/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 #define SORT_RESET -1

cockatrice/src/dialogs/dlg_select_set_for_cards.cpp

@@ -1,6 +1,5 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../deck/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
 #include "dlg_select_set_for_cards.h"
@@ -17,6 +16,7 @@
 #include <QVBoxLayout>
 #include <algorithm>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <qdrag.h>
 #include <qevent.h>
 

cockatrice/src/dialogs/dlg_select_set_for_cards.h

@@ -7,7 +7,6 @@
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
-#include "../deck/deck_list_model.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
 
 #include <QCheckBox>
@@ -17,6 +16,7 @@
 #include <QMap>
 #include <QScrollArea>
 #include <QVBoxLayout>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class SetEntryWidget; // Forward declaration
 

cockatrice/src/dialogs/dlg_settings.cpp

@@ -1,14 +1,14 @@
 #include "dlg_settings.h"
 
-#include "../client/get_text_with_max.h"
-#include "../client/network/release_channel.h"
-#include "../client/network/spoiler_background_updater.h"
+#include "../client/network/update/card_spoiler/spoiler_background_updater.h"
+#include "../client/network/update/client/release_channel.h"
 #include "../client/sound_engine.h"
-#include "../deck/custom_line_edit.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/theme_manager.h"
-#include "../interface/utility/sequence_edit.h"
 #include "../interface/widgets/general/background_sources.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../interface/widgets/utility/get_text_with_max.h"
+#include "../interface/widgets/utility/sequence_edit.h"
 #include "../main.h"
 #include "../tabs/tab_supervisor.h"
 

cockatrice/src/dialogs/dlg_update.cpp

@@ -1,7 +1,7 @@
 #include "dlg_update.h"
 
-#include "../client/network/client_update_checker.h"
-#include "../client/network/release_channel.h"
+#include "../client/network/update/client/client_update_checker.h"
+#include "../client/network/update/client/release_channel.h"
 #include "../interface/window_main.h"
 
 #include <QApplication>

cockatrice/src/dialogs/dlg_update.h

@@ -7,7 +7,7 @@
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "../client/update_downloader.h"
+#include "../client/network/update/client/update_downloader.h"
 
 #include <QDialogButtonBox>
 #include <QLoggingCategory>

cockatrice/src/filters/filter_builder.cpp

@@ -1,6 +1,6 @@
 #include "filter_builder.h"
 
-#include "../deck/custom_line_edit.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 #include "filter_card.h"
 
 #include <QComboBox>

cockatrice/src/game/board/abstract_counter.h

@@ -7,7 +7,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../interface/tearoff_menu.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,6 +1,5 @@
 #include "deck_view_container.h"
 
-#include "../../deck/deck_loader.h"
 #include "../../dialogs/dlg_load_deck.h"
 #include "../../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../dialogs/dlg_load_deck_from_website.h"
@@ -16,6 +15,7 @@
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>

cockatrice/src/game/deckview/deck_view_container.h

@@ -7,9 +7,8 @@
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../deck/deck_loader.h"
-
 #include <QPushButton>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 class QVBoxLayout;
 class AbstractCardItem;

cockatrice/src/game/log/message_log_widget.h

@@ -8,7 +8,7 @@
 #define MESSAGELOGWIDGET_H
 
 #include "../../client/translation.h"
-#include "../../server/chat_view/chat_view.h"
+#include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
 
 #include <libcockatrice/network/server/remote/user_level.h>

cockatrice/src/game/player/menu/grave_menu.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_GRAVE_MENU_H
 #define COCKATRICE_GRAVE_MENU_H
 
-#include "../../../interface/tearoff_menu.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/hand_menu.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_HAND_MENU_H
 #define COCKATRICE_HAND_MENU_H
 
-#include "../../../interface/tearoff_menu.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/library_menu.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_LIBRARY_MENU_H
 #define COCKATRICE_LIBRARY_MENU_H
 
-#include "../../../interface/tearoff_menu.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/player_menu.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_PLAYER_MENU_H
 #define COCKATRICE_PLAYER_MENU_H
 
-#include "../../../interface/tearoff_menu.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../player.h"
 #include "custom_zone_menu.h"
 #include "grave_menu.h"

cockatrice/src/game/player/menu/rfg_menu.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_RFG_MENU_H
 #define COCKATRICE_RFG_MENU_H
 
-#include "../../../interface/tearoff_menu.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/player.h

@@ -8,7 +8,7 @@
 #define PLAYER_H
 
 #include "../../filters/filter_string.h"
-#include "../../interface/tearoff_menu.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
 #include "../board/abstract_graphics_item.h"
 #include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"

cockatrice/src/game/player/player_actions.cpp

@@ -1,6 +1,6 @@
 #include "player_actions.h"
 
-#include "../../client/get_text_with_max.h"
+#include "../../interface/widgets/utility/get_text_with_max.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../dialogs/dlg_move_top_cards_until.h"

cockatrice/src/game/player/player_info.h

@@ -7,7 +7,6 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "../../deck/deck_loader.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
@@ -15,6 +14,7 @@
 #include "player_target.h"
 
 #include <QObject>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class PlayerInfo : public QObject

cockatrice/src/game/player/player_list_widget.cpp

@@ -1,9 +1,9 @@
 #include "player_list_widget.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "../../server/user/user_context_menu.h"
-#include "../../server/user/user_list_manager.h"
-#include "../../server/user/user_list_widget.h"
+#include "../../interface/widgets/server/user/user_context_menu.h"
+#include "../../interface/widgets/server/user/user_list_manager.h"
+#include "../../interface/widgets/server/user/user_list_widget.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_game.h"
 #include "../../tabs/tab_supervisor.h"

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -1,8 +1,8 @@
 #include "card_group_display_widget.h"
 
-#include "../../../../deck/deck_list_model.h"
-#include "../../../utility/deck_list_sort_filter_proxy_model.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
+#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
+#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_database/card_database_manager.h>

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -7,7 +7,6 @@
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include "../../../../deck/deck_list_model.h"
 #include "../../general/display/banner_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 #include "../card_size_widget.h"
@@ -16,6 +15,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class CardGroupDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp

@@ -1,7 +1,7 @@
 #include "flat_card_group_display_widget.h"
 
-#include "../../../../deck/deck_list_model.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
+#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_database/card_database_manager.h>

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp

@@ -1,11 +1,11 @@
 #include "overlapped_card_group_display_widget.h"
 
-#include "../../../../deck/deck_list_model.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp

@@ -1,11 +1,11 @@
 #include "deck_card_zone_display_widget.h"
 
-#include "../../../deck/deck_list_model.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h

@@ -7,7 +7,6 @@
 #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
 #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/overlap_widget.h"
 #include "../visual_deck_editor/visual_deck_editor_widget.h"
@@ -18,6 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class DeckCardZoneDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h

@@ -7,7 +7,6 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "mana_base_widget.h"
 #include "mana_curve_widget.h"
@@ -18,6 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class DeckAnalyticsWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp

@@ -1,6 +1,5 @@
 #include "mana_base_widget.h"
 
-#include "../../../deck/deck_loader.h"
 #include "../general/display/banner_widget.h"
 #include "../general/display/bar_widget.h"
 
@@ -9,6 +8,7 @@
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
     : QWidget(parent), deckListModel(_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h

@@ -7,12 +7,12 @@
 #ifndef MANA_BASE_WIDGET_H
 #define MANA_BASE_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 #include <utility>
 
 class ManaBaseWidget : public QWidget

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp

@@ -1,6 +1,5 @@
 #include "mana_curve_widget.h"
 
-#include "../../../deck/deck_loader.h"
 #include "../../../main.h"
 #include "../general/display/banner_widget.h"
 #include "../general/display/bar_widget.h"
@@ -8,6 +7,7 @@
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <unordered_map>
 
 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h

@@ -7,11 +7,11 @@
 #ifndef MANA_CURVE_WIDGET_H
 #define MANA_CURVE_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
 #include <QHBoxLayout>
 #include <QWidget>
+#include <libcockatrice/deck_list/deck_list_model.h>
 #include <unordered_map>
 
 class ManaCurveWidget : public QWidget

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp

@@ -1,6 +1,5 @@
 #include "mana_devotion_widget.h"
 
-#include "../../../deck/deck_loader.h"
 #include "../../../main.h"
 #include "../general/display/banner_widget.h"
 #include "../general/display/bar_widget.h"
@@ -9,6 +8,7 @@
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 #include <regex>
 #include <string>
 #include <unordered_map>

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h

@@ -7,12 +7,12 @@
 #ifndef MANA_DEVOTION_WIDGET_H
 #define MANA_DEVOTION_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 #include <utility>
 
 class ManaDevotionWidget : public QWidget

cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h

@@ -8,8 +8,8 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../deck/custom_line_edit.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../utility/custom_line_edit.h"
 
 #include <QHBoxLayout>
 #include <QWidget>

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -8,8 +8,8 @@
 #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
 #define DECK_EDITOR_DECK_DOCK_WIDGET_H
 
-#include "../../../deck/custom_line_edit.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../utility/custom_line_edit.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 
 #include <QComboBox>

cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp

@@ -1,9 +1,9 @@
 #include "overlap_widget.h"
 
-#include "../../../../deck/deck_list_model.h"
 #include "../../../layouts/flow_layout.h"
 
 #include <QWidget>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 /**
  * @class OverlapWidget

cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp

@@ -1,4 +1,4 @@
-#include "deck_editor_menu.h"
+#include "../../../interface/widgets/menus/deck_editor_menu.h"
 
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/settings/shortcuts_settings.h>

cockatrice/src/interface/widgets/menus/deck_editor_menu.h

@@ -7,7 +7,7 @@
 #ifndef DECK_EDITOR_MENU_H
 #define DECK_EDITOR_MENU_H
 
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QMenu>
 

cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h

@@ -7,12 +7,12 @@
 
 #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
 #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
-#include "../../../deck/deck_list_model.h"
-#include "../../../deck/deck_loader.h"
 #include "card_amount_widget.h"
 
 #include <QVBoxLayout>
 #include <QWidget>
+#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 class AllZonesCardAmountWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h

@@ -8,8 +8,6 @@
 #ifndef CARD_AMOUNT_WIDGET_H
 #define CARD_AMOUNT_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
-#include "../../../deck/deck_loader.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../general/display/dynamic_font_size_push_button.h"
 
@@ -19,6 +17,8 @@
 #include <QTreeView>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/deck_list/deck_loader.h>
 
 class CardAmountWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/printing_selector.h

@@ -7,7 +7,6 @@
 #ifndef PRINTING_SELECTOR_H
 #define PRINTING_SELECTOR_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../quick_settings/settings_button_widget.h"
@@ -19,6 +18,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 #define BATCH_SIZE 10
 

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h

@@ -7,7 +7,6 @@
 #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
@@ -15,6 +14,7 @@
 #include <QPainter>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h

@@ -7,7 +7,6 @@
 #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 
-#include "../../../deck/deck_list_model.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../cards/card_info_picture_widget.h"
 #include "all_zones_card_amount_widget.h"
@@ -15,6 +14,7 @@
 #include "set_name_and_collectors_number_display_widget.h"
 
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardOverlayWidget : public QWidget
 {

cockatrice/src/interface/widgets/replay/replay_manager.cpp

@@ -1,6 +1,6 @@
 #include "replay_manager.h"
 
-#include "../tabs/tab_game.h"
+#include "../../../tabs/tab_game.h"
 
 #include <QHBoxLayout>
 #include <QToolButton>

cockatrice/src/interface/widgets/replay/replay_manager.h

@@ -8,7 +8,7 @@
 #ifndef REPLAY_MANAGER_H
 #define REPLAY_MANAGER_H
 
-#include "network/replay_timeline_widget.h"
+#include "replay_timeline_widget.h"
 
 #include <QToolButton>
 #include <QWidget>

cockatrice/src/interface/widgets/replay/replay_timeline_widget.h

@@ -7,7 +7,7 @@
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
-#include "../../game/player/event_processing_options.h"
+#include "../../../game/player/event_processing_options.h"
 
 #include <QList>
 #include <QMouseEvent>

cockatrice/src/interface/widgets/server/game_selector.cpp

@@ -1,8 +1,8 @@
 #include "game_selector.h"
 
-#include "../client/get_text_with_max.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../dialogs/dlg_filter_games.h"
+#include "../interface/widgets/utility/get_text_with_max.h"
 #include "../tabs/tab_account.h"
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_room.h"

cockatrice/src/interface/widgets/server/user/user_info_box.cpp

@@ -1,10 +1,10 @@
 #include "user_info_box.h"
 
-#include "../../client/get_text_with_max.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
 #include "../../dialogs/dlg_edit_user.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/widgets/utility/get_text_with_max.h"
 
 #include <QDateTime>
 #include <QGridLayout>

cockatrice/src/interface/widgets/utility/line_edit_completer.h

@@ -7,7 +7,7 @@
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
-#include "../deck/custom_line_edit.h"
+#include "custom_line_edit.h"
 
 #include <QFocusEvent>
 #include <QKeyEvent>