diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index b9c3d87dd..f8097a126 100644 --- a/cockatrice/CMakeLists.txt +++ b/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) diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp similarity index 100% rename from cockatrice/src/deck/deck_stats_interface.cpp rename to cockatrice/src/client/network/interfaces/deck_stats_interface.cpp diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h similarity index 100% rename from cockatrice/src/deck/deck_stats_interface.h rename to cockatrice/src/client/network/interfaces/deck_stats_interface.h diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp similarity index 100% rename from cockatrice/src/client/tapped_out_interface.cpp rename to cockatrice/src/client/network/interfaces/tapped_out_interface.cpp diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h similarity index 100% rename from cockatrice/src/client/tapped_out_interface.h rename to cockatrice/src/client/network/interfaces/tapped_out_interface.h diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h index e58f31bcc..9b7b61283 100644 --- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h +++ b/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 #include +#include class IJsonDeckParser { diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp similarity index 99% rename from cockatrice/src/client/network/spoiler_background_updater.cpp rename to cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp index 3a35620bb..653d5c172 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/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 #include diff --git a/cockatrice/src/client/network/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h similarity index 100% rename from cockatrice/src/client/network/spoiler_background_updater.h rename to cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h diff --git a/cockatrice/src/client/network/client_update_checker.cpp b/cockatrice/src/client/network/update/client/client_update_checker.cpp similarity index 100% rename from cockatrice/src/client/network/client_update_checker.cpp rename to cockatrice/src/client/network/update/client/client_update_checker.cpp diff --git a/cockatrice/src/client/network/client_update_checker.h b/cockatrice/src/client/network/update/client/client_update_checker.h similarity index 100% rename from cockatrice/src/client/network/client_update_checker.h rename to cockatrice/src/client/network/update/client/client_update_checker.h diff --git a/cockatrice/src/client/network/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp similarity index 100% rename from cockatrice/src/client/network/release_channel.cpp rename to cockatrice/src/client/network/update/client/release_channel.cpp diff --git a/cockatrice/src/client/network/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h similarity index 100% rename from cockatrice/src/client/network/release_channel.h rename to cockatrice/src/client/network/update/client/release_channel.h diff --git a/cockatrice/src/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp similarity index 100% rename from cockatrice/src/client/update_downloader.cpp rename to cockatrice/src/client/network/update/client/update_downloader.cpp diff --git a/cockatrice/src/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h similarity index 100% rename from cockatrice/src/client/update_downloader.h rename to cockatrice/src/client/network/update/client/update_downloader.h diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h index fd571fc30..e89f0b4d6 100644 --- a/cockatrice/src/dialogs/dlg_connect.h +++ b/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 #include diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index 5cf502cfd..a54692778 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/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 diff --git a/cockatrice/src/dialogs/dlg_filter_games.h b/cockatrice/src/dialogs/dlg_filter_games.h index bba68b973..ab07a02d4 100644 --- a/cockatrice/src/dialogs/dlg_filter_games.h +++ b/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 #include diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp index fe9151b54..9c37fbe50 100644 --- a/cockatrice/src/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck.cpp @@ -1,7 +1,6 @@ #include "dlg_load_deck.h" -#include "../deck/deck_loader.h" - +#include #include DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp index 3f0275dd7..6ff31acbd 100644 --- a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/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 @@ -12,6 +11,7 @@ #include #include #include +#include #include /** diff --git a/cockatrice/src/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/dialogs/dlg_load_remote_deck.cpp index 5e2823b57..9abe1949a 100644 --- a/cockatrice/src/dialogs/dlg_load_remote_deck.cpp +++ b/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 #include diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index ea95c1ed6..2c95fed83 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/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 @@ -21,6 +20,7 @@ #include #include #include +#include #include #define SORT_RESET -1 diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index b6da8fafe..22805d1a2 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/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 #include #include +#include #include #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/dialogs/dlg_select_set_for_cards.h index 77f9bd077..278ffc2e4 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.h +++ b/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 @@ -17,6 +16,7 @@ #include #include #include +#include class SetEntryWidget; // Forward declaration diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 2d3c9168c..b12b938b6 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/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" diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp index ca5100f09..cd7f3e8ba 100644 --- a/cockatrice/src/dialogs/dlg_update.cpp +++ b/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 diff --git a/cockatrice/src/dialogs/dlg_update.h b/cockatrice/src/dialogs/dlg_update.h index 45ae92178..daf0b9e47 100644 --- a/cockatrice/src/dialogs/dlg_update.h +++ b/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 #include diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp index 97056ac60..8f91bcca7 100644 --- a/cockatrice/src/filters/filter_builder.cpp +++ b/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 diff --git a/cockatrice/src/game/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h index 4c39340fa..ea13cb00f 100644 --- a/cockatrice/src/game/board/abstract_counter.h +++ b/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 #include diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 22402ee63..7fae429e7 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/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 #include #include +#include #include #include #include diff --git a/cockatrice/src/game/deckview/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h index 36474b4c2..b61b21468 100644 --- a/cockatrice/src/game/deckview/deck_view_container.h +++ b/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 +#include class QVBoxLayout; class AbstractCardItem; diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h index b40f6e5e4..a185cb288 100644 --- a/cockatrice/src/game/log/message_log_widget.h +++ b/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 diff --git a/cockatrice/src/game/player/menu/grave_menu.h b/cockatrice/src/game/player/menu/grave_menu.h index 7b4981f38..faaf497b6 100644 --- a/cockatrice/src/game/player/menu/grave_menu.h +++ b/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 #include diff --git a/cockatrice/src/game/player/menu/hand_menu.h b/cockatrice/src/game/player/menu/hand_menu.h index f37bd794e..f66cf25bb 100644 --- a/cockatrice/src/game/player/menu/hand_menu.h +++ b/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 #include diff --git a/cockatrice/src/game/player/menu/library_menu.h b/cockatrice/src/game/player/menu/library_menu.h index af7eef4c8..b82a78b12 100644 --- a/cockatrice/src/game/player/menu/library_menu.h +++ b/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 #include diff --git a/cockatrice/src/game/player/menu/player_menu.h b/cockatrice/src/game/player/menu/player_menu.h index 6d8b67bb0..2019e4397 100644 --- a/cockatrice/src/game/player/menu/player_menu.h +++ b/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" diff --git a/cockatrice/src/game/player/menu/rfg_menu.h b/cockatrice/src/game/player/menu/rfg_menu.h index 268bc0719..0b4623d2a 100644 --- a/cockatrice/src/game/player/menu/rfg_menu.h +++ b/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 #include diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index cd0e3cec7..eb62437fa 100644 --- a/cockatrice/src/game/player/player.h +++ b/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" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 004053b1e..2e2685ec8 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/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" diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h index a8bd63cd0..a9353bf60 100644 --- a/cockatrice/src/game/player/player_info.h +++ b/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 +#include #include class PlayerInfo : public QObject diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index 009703499..98cfd4ff9 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/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" diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 36f0e6a4e..da45686ad 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/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 #include diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 4920d97d8..914d234f0 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/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 #include #include +#include class CardGroupDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index cc46d59eb..4f723b224 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/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 #include diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index df02c9e1c..78b864fc6 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/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 #include #include +#include OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 892652c02..419bdb648 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/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 #include +#include DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 12be2debf..976493137 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/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 #include #include +#include class DeckCardZoneDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index e1c4627fe..3dc62d132 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/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 #include #include +#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index 4981d0a2d..d1338e2ae 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/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 #include #include +#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index f202eb31e..9d661c319 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h +++ b/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 #include #include +#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index 5b50d953f..235e7fe7b 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/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 #include #include +#include #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h index e025df091..ced7727a5 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h +++ b/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 #include +#include #include class ManaCurveWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index cfe5684c8..01104e20d 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/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 #include #include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index 03cb9aa38..b4daf8f6a 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h +++ b/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 #include #include +#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index 8fc9176bd..849e4d56c 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/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 #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 7c568f6ca..4d09088c9 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/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 diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp index ac5d9f520..89ca38b67 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp +++ b/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 +#include /** * @class OverlapWidget diff --git a/cockatrice/src/client/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp similarity index 99% rename from cockatrice/src/client/deck_editor_menu.cpp rename to cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp index bc6337b56..aac488dd1 100644 --- a/cockatrice/src/client/deck_editor_menu.cpp +++ b/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 #include diff --git a/cockatrice/src/client/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h similarity index 95% rename from cockatrice/src/client/deck_editor_menu.h rename to cockatrice/src/interface/widgets/menus/deck_editor_menu.h index 205cf6344..ce9bfeaaa 100644 --- a/cockatrice/src/client/deck_editor_menu.h +++ b/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 diff --git a/cockatrice/src/interface/tearoff_menu.h b/cockatrice/src/interface/widgets/menus/tearoff_menu.h similarity index 100% rename from cockatrice/src/interface/tearoff_menu.h rename to cockatrice/src/interface/widgets/menus/tearoff_menu.h diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h index b666a126d..9506f88ea 100644 --- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h +++ b/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 #include +#include +#include class AllZonesCardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index 5e23ccf2a..811e642ed 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/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 #include #include +#include +#include class CardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index c44057070..8fc924563 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/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 #include #include +#include #define BATCH_SIZE 10 diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index f5b4a1392..17cb20dab 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/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 #include #include +#include class PrintingSelectorCardDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 25c8f771c..712685925 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/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 +#include class PrintingSelectorCardOverlayWidget : public QWidget { diff --git a/cockatrice/src/client/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp similarity index 99% rename from cockatrice/src/client/replay_manager.cpp rename to cockatrice/src/interface/widgets/replay/replay_manager.cpp index 843632c99..7674eaa08 100644 --- a/cockatrice/src/client/replay_manager.cpp +++ b/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 #include diff --git a/cockatrice/src/client/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h similarity index 96% rename from cockatrice/src/client/replay_manager.h rename to cockatrice/src/interface/widgets/replay/replay_manager.h index 8b9ed4e1f..9469adcd4 100644 --- a/cockatrice/src/client/replay_manager.h +++ b/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 #include diff --git a/cockatrice/src/client/network/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp similarity index 100% rename from cockatrice/src/client/network/replay_timeline_widget.cpp rename to cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp diff --git a/cockatrice/src/client/network/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h similarity index 97% rename from cockatrice/src/client/network/replay_timeline_widget.h rename to cockatrice/src/interface/widgets/replay/replay_timeline_widget.h index aa9e03e31..e55d408ce 100644 --- a/cockatrice/src/client/network/replay_timeline_widget.h +++ b/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 #include diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp similarity index 100% rename from cockatrice/src/server/chat_view/chat_view.cpp rename to cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h similarity index 100% rename from cockatrice/src/server/chat_view/chat_view.h rename to cockatrice/src/interface/widgets/server/chat_view/chat_view.h diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp similarity index 99% rename from cockatrice/src/server/game_selector.cpp rename to cockatrice/src/interface/widgets/server/game_selector.cpp index 175def86d..61fd51d88 100644 --- a/cockatrice/src/server/game_selector.cpp +++ b/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" diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h similarity index 100% rename from cockatrice/src/server/game_selector.h rename to cockatrice/src/interface/widgets/server/game_selector.h diff --git a/cockatrice/src/server/game_type_map.h b/cockatrice/src/interface/widgets/server/game_type_map.h similarity index 100% rename from cockatrice/src/server/game_type_map.h rename to cockatrice/src/interface/widgets/server/game_type_map.h diff --git a/cockatrice/src/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp similarity index 100% rename from cockatrice/src/server/games_model.cpp rename to cockatrice/src/interface/widgets/server/games_model.cpp diff --git a/cockatrice/src/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h similarity index 100% rename from cockatrice/src/server/games_model.h rename to cockatrice/src/interface/widgets/server/games_model.h diff --git a/cockatrice/src/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp similarity index 100% rename from cockatrice/src/server/handle_public_servers.cpp rename to cockatrice/src/interface/widgets/server/handle_public_servers.cpp diff --git a/cockatrice/src/server/handle_public_servers.h b/cockatrice/src/interface/widgets/server/handle_public_servers.h similarity index 100% rename from cockatrice/src/server/handle_public_servers.h rename to cockatrice/src/interface/widgets/server/handle_public_servers.h diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp similarity index 100% rename from cockatrice/src/server/remote/remote_decklist_tree_widget.cpp rename to cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h similarity index 100% rename from cockatrice/src/server/remote/remote_decklist_tree_widget.h rename to cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp similarity index 100% rename from cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp rename to cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h similarity index 100% rename from cockatrice/src/server/remote/remote_replay_list_tree_widget.h rename to cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp similarity index 100% rename from cockatrice/src/server/user/user_context_menu.cpp rename to cockatrice/src/interface/widgets/server/user/user_context_menu.cpp diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/interface/widgets/server/user/user_context_menu.h similarity index 100% rename from cockatrice/src/server/user/user_context_menu.h rename to cockatrice/src/interface/widgets/server/user/user_context_menu.h diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp similarity index 99% rename from cockatrice/src/server/user/user_info_box.cpp rename to cockatrice/src/interface/widgets/server/user/user_info_box.cpp index e756dfbc9..d795e9622 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/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 #include diff --git a/cockatrice/src/server/user/user_info_box.h b/cockatrice/src/interface/widgets/server/user/user_info_box.h similarity index 100% rename from cockatrice/src/server/user/user_info_box.h rename to cockatrice/src/interface/widgets/server/user/user_info_box.h diff --git a/cockatrice/src/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp similarity index 100% rename from cockatrice/src/server/user/user_info_connection.cpp rename to cockatrice/src/interface/widgets/server/user/user_info_connection.cpp diff --git a/cockatrice/src/server/user/user_info_connection.h b/cockatrice/src/interface/widgets/server/user/user_info_connection.h similarity index 100% rename from cockatrice/src/server/user/user_info_connection.h rename to cockatrice/src/interface/widgets/server/user/user_info_connection.h diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp similarity index 100% rename from cockatrice/src/server/user/user_list_manager.cpp rename to cockatrice/src/interface/widgets/server/user/user_list_manager.cpp diff --git a/cockatrice/src/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h similarity index 100% rename from cockatrice/src/server/user/user_list_manager.h rename to cockatrice/src/interface/widgets/server/user/user_list_manager.h diff --git a/cockatrice/src/server/user/user_list_proxy.h b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h similarity index 100% rename from cockatrice/src/server/user/user_list_proxy.h rename to cockatrice/src/interface/widgets/server/user/user_list_proxy.h diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp similarity index 100% rename from cockatrice/src/server/user/user_list_widget.cpp rename to cockatrice/src/interface/widgets/server/user/user_list_widget.cpp diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h similarity index 100% rename from cockatrice/src/server/user/user_list_widget.h rename to cockatrice/src/interface/widgets/server/user/user_list_widget.h diff --git a/cockatrice/src/deck/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp similarity index 100% rename from cockatrice/src/deck/custom_line_edit.cpp rename to cockatrice/src/interface/widgets/utility/custom_line_edit.cpp diff --git a/cockatrice/src/deck/custom_line_edit.h b/cockatrice/src/interface/widgets/utility/custom_line_edit.h similarity index 100% rename from cockatrice/src/deck/custom_line_edit.h rename to cockatrice/src/interface/widgets/utility/custom_line_edit.h diff --git a/cockatrice/src/client/get_text_with_max.cpp b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp similarity index 100% rename from cockatrice/src/client/get_text_with_max.cpp rename to cockatrice/src/interface/widgets/utility/get_text_with_max.cpp diff --git a/cockatrice/src/client/get_text_with_max.h b/cockatrice/src/interface/widgets/utility/get_text_with_max.h similarity index 100% rename from cockatrice/src/client/get_text_with_max.h rename to cockatrice/src/interface/widgets/utility/get_text_with_max.h diff --git a/cockatrice/src/interface/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp similarity index 100% rename from cockatrice/src/interface/line_edit_completer.cpp rename to cockatrice/src/interface/widgets/utility/line_edit_completer.cpp diff --git a/cockatrice/src/interface/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h similarity index 94% rename from cockatrice/src/interface/line_edit_completer.h rename to cockatrice/src/interface/widgets/utility/line_edit_completer.h index 1b2ca14d6..23e4d4aba 100644 --- a/cockatrice/src/interface/line_edit_completer.h +++ b/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 #include diff --git a/cockatrice/src/interface/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp similarity index 100% rename from cockatrice/src/interface/utility/sequence_edit.cpp rename to cockatrice/src/interface/widgets/utility/sequence_edit.cpp diff --git a/cockatrice/src/interface/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h similarity index 100% rename from cockatrice/src/interface/utility/sequence_edit.h rename to cockatrice/src/interface/widgets/utility/sequence_edit.h diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index b436c84f5..3676707f2 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -1,11 +1,11 @@ #include "visual_database_display_widget.h" -#include "../../../deck/custom_line_edit.h" #include "../../../filters/filter_tree_model.h" #include "../../../filters/syntax_help.h" #include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../quick_settings/settings_button_widget.h" +#include "../utility/custom_line_edit.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 736223dee..e41451e33 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -7,8 +7,6 @@ #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H -#include "../../../deck/custom_line_edit.h" -#include "../../../deck/deck_list_model.h" #include "../../../filters/filter_tree_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../layouts/flow_layout.h" @@ -16,6 +14,7 @@ #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" +#include "../utility/custom_line_edit.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" @@ -30,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index c73260115..b9f3914d5 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -1,9 +1,9 @@ #include "visual_deck_editor_sample_hand_widget.h" -#include "../../../deck/deck_loader.h" #include "../cards/card_info_picture_widget.h" #include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h index 97c3bed28..6aaa6ca23 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h @@ -7,13 +7,13 @@ #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H -#include "../../../deck/deck_list_model.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include #include #include +#include class VisualDeckEditorSampleHandWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index bf2c7f7e7..634830fa6 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -1,7 +1,5 @@ #include "visual_deck_editor_widget.h" -#include "../../../deck/deck_list_model.h" -#include "../../../deck/deck_loader.h" #include "../../../main.h" #include "../../layouts/overlap_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" @@ -21,6 +19,8 @@ #include #include #include +#include +#include #include VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index 06e41f408..afb8cde91 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -7,7 +7,6 @@ #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H -#include "../../../deck/deck_list_model.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" @@ -22,6 +21,7 @@ #include #include #include +#include #include class DeckCardZoneDisplayWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h index 86f544bd1..ceb02b0f5 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h @@ -7,10 +7,10 @@ #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H -#include "../../../../deck/deck_loader.h" #include "deck_preview_widget.h" #include +#include inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index 152cb3e97..e780f9369 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -7,7 +7,6 @@ #ifndef DECK_PREVIEW_WIDGET_H #define DECK_PREVIEW_WIDGET_H -#include "../../../../deck/deck_loader.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "../visual_deck_storage_widget.h" @@ -19,6 +18,7 @@ #include #include #include +#include class QMenu; class VisualDeckStorageWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h index 64741e803..54bbc954f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -7,7 +7,6 @@ #ifndef VISUAL_DECK_STORAGE_WIDGET_H #define VISUAL_DECK_STORAGE_WIDGET_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" @@ -21,6 +20,7 @@ #include #include +#include class QSpinBox; class VisualDeckStorageSearchWidget; diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index fbe9b5b10..ca616b7a9 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -19,9 +19,8 @@ ***************************************************************************/ #include "window_main.h" -#include "../client/get_text_with_max.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 "../dialogs/dlg_connect.h" #include "../dialogs/dlg_edit_tokens.h" #include "../dialogs/dlg_forgot_password_challenge.h" @@ -38,6 +37,7 @@ #include "../tabs/tab_game.h" #include "../tabs/tab_supervisor.h" #include "version_string.h" +#include "widgets/utility/get_text_with_max.h" #include #include diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 14b824eb3..fce44f8c6 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -21,7 +21,7 @@ #include "main.h" #include "QtNetwork/QNetworkInterface" -#include "client/network/spoiler_background_updater.h" +#include "client/network/update/card_spoiler/spoiler_background_updater.h" #include "client/sound_engine.h" #include "dialogs/dlg_settings.h" #include "interface/pixel_map_generator.h" diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index af120ac8b..2a7a8a129 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/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" diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/tabs/abstract_tab_deck_editor.h index 9e4e6c14e..bdf35b3da 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.h +++ b/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" diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp index c25f4e5aa..0f1003a14 100644 --- a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp +++ b/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 #include #include #include #include +#include void EdhrecDeckApiResponse::fromJson(const QJsonArray &json) { diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h index 952162a4e..9aa8ff821 100644 --- a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h +++ b/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 #include #include #include #include +#include class EdhrecDeckApiResponse { diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index fb2df4907..e61732f90 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/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 diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index b4202803f..24548cb6c 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/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 diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index 5940d1210..165ee0a17 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/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 #include @@ -19,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h index c0c4e9cfa..9509d2329 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 "../server/remote/remote_decklist_tree_widget.h" +#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h" #include "tab.h" #include diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index 7c1bb6aee..473e2caad 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/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 diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h index 956b72c9b..2dfbc9b9f 100644 --- a/cockatrice/src/tabs/tab_game.h +++ b/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" diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index c23a26be3..d27094c1a 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/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 #include diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 671a3285d..3e6a86384 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/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 #include diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index eb6543e44..836d900b6 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/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 diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index 8ecf2061b..b77693599 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/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" diff --git a/cockatrice/src/tabs/tab_room.h b/cockatrice/src/tabs/tab_room.h index 3eb1b580f..8aadab499 100644 --- a/cockatrice/src/tabs/tab_room.h +++ b/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 diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp index 593eb0702..bd4fa2be3 100644 --- a/cockatrice/src/tabs/tab_server.cpp +++ b/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 diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp index 41d05f618..8eee1d5e0 100644 --- a/cockatrice/src/tabs/tab_supervisor.cpp +++ b/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" diff --git a/cockatrice/src/tabs/tab_supervisor.h b/cockatrice/src/tabs/tab_supervisor.h index 014d99825..a3b3d9713 100644 --- a/cockatrice/src/tabs/tab_supervisor.h +++ b/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 #include #include +#include inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor"); diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 15eb54a20..a0073c047 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/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 #include #include +#include #include #include #include diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index 6acdad8d6..32cf042d6 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -13,6 +13,7 @@ set(HEADERS libcockatrice/card/card_database/model/card_database_display_model.h libcockatrice/card/card_database/model/card/card_completer_proxy_model.h libcockatrice/card/card_database/model/card/card_search_model.h + libcockatrice/card/card_database/model/card_set/card_sets_model.h libcockatrice/card/card_database/model/token/token_display_model.h libcockatrice/card/card_database/model/token/token_edit_model.h libcockatrice/card/card_database/parser/card_database_parser.h @@ -39,6 +40,7 @@ add_library( libcockatrice/card/card_database/card_database_querier.cpp libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp libcockatrice/card/card_database/model/card/card_search_model.cpp + libcockatrice/card/card_database/model/card_set/card_sets_model.cpp libcockatrice/card/card_database/model/card_database_display_model.cpp libcockatrice/card/card_database/model/card_database_model.cpp libcockatrice/card/card_database/model/token/token_display_model.cpp diff --git a/cockatrice/src/client/network/sets_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.cpp similarity index 99% rename from cockatrice/src/client/network/sets_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.cpp index a86b710b5..2af815246 100644 --- a/cockatrice/src/client/network/sets_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.cpp @@ -1,4 +1,4 @@ -#include "sets_model.h" +#include "card_sets_model.h" #include diff --git a/cockatrice/src/client/network/sets_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.h similarity index 100% rename from cockatrice/src/client/network/sets_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.h diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 0523343f6..0464d0f6a 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -3,8 +3,13 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - libcockatrice/deck_list/abstract_deck_list_card_node.h libcockatrice/deck_list/abstract_deck_list_node.h - libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/deck_list_card_node.h + libcockatrice/deck_list/abstract_deck_list_card_node.h + libcockatrice/deck_list/abstract_deck_list_node.h + libcockatrice/deck_list/deck_list.h + libcockatrice/deck_list/deck_list_card_node.h + libcockatrice/deck_list/deck_list_model.h + libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h + libcockatrice/deck_list/deck_loader.h libcockatrice/deck_list/inner_deck_list_node.h ) @@ -16,9 +21,15 @@ endif() add_library( libcockatrice_deck_list STATIC - ${MOC_SOURCES} libcockatrice/deck_list/abstract_deck_list_card_node.cpp - libcockatrice/deck_list/abstract_deck_list_node.cpp libcockatrice/deck_list/deck_list.cpp - libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_node.cpp + ${MOC_SOURCES} + libcockatrice/deck_list/abstract_deck_list_card_node.cpp + libcockatrice/deck_list/abstract_deck_list_node.cpp + libcockatrice/deck_list/deck_list.cpp + libcockatrice/deck_list/deck_list_card_node.cpp + libcockatrice/deck_list/deck_list_model.cpp + libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp + libcockatrice/deck_list/deck_loader.cpp + libcockatrice/deck_list/inner_deck_list_node.cpp ) add_dependencies(libcockatrice_deck_list libcockatrice_protocol) @@ -26,5 +37,6 @@ add_dependencies(libcockatrice_deck_list libcockatrice_protocol) target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES} + libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_card libcockatrice_utility + ${COCKATRICE_QT_MODULES} ) diff --git a/cockatrice/src/deck/deck_list_model.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp similarity index 99% rename from cockatrice/src/deck/deck_list_model.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp index 93179d79c..dfaba91c0 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp @@ -1,6 +1,5 @@ #include "deck_list_model.h" -#include "../main.h" #include "deck_loader.h" #include diff --git a/cockatrice/src/deck/deck_list_model.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h similarity index 100% rename from cockatrice/src/deck/deck_list_model.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h diff --git a/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp similarity index 98% rename from cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp index 90be2546d..35fd4d9f8 100644 --- a/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp @@ -1,6 +1,6 @@ #include "deck_list_sort_filter_proxy_model.h" -#include "../../deck/deck_list_model.h" +#include "deck_list_model.h" bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { diff --git a/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h similarity index 100% rename from cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h diff --git a/cockatrice/src/deck/deck_loader.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp similarity index 99% rename from cockatrice/src/deck/deck_loader.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp index ee28ec1a6..bfc1fc62c 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp @@ -1,7 +1,5 @@ #include "deck_loader.h" -#include "../main.h" - #include #include #include diff --git a/cockatrice/src/deck/deck_loader.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.h similarity index 100% rename from cockatrice/src/deck/deck_loader.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.h diff --git a/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp index 65b410daf..f730877d1 100644 --- a/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp @@ -1,8 +1,8 @@ #include "cache_settings.h" +#include "../../../cockatrice/src/client/network/update/client/release_channel.h" #include "card_counter_settings.h" #include "card_override_settings.h" -#include "release_channel.h" #include #include diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index a67632022..0331b287c 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -23,7 +23,7 @@ set(oracle_SOURCES src/pagetemplates.cpp src/parsehelpers.cpp src/qt-json/json.cpp - ../cockatrice/src/client/network/release_channel.cpp + ../cockatrice/src/client/network/update/client/release_channel.cpp ../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp index 4593a7b56..e4fc64cf9 100644 --- a/tests/test_age_formatting.cpp +++ b/tests/test_age_formatting.cpp @@ -1,4 +1,4 @@ -#include "../cockatrice/src/server/user/user_info_box.h" +#include "../cockatrice/src/interface/widgets/server/user/user_info_box.h" #include "gtest/gtest.h"