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