From 7ac22a6ce88af450388d7173f2aa3f8d7196ce75 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Tue, 16 Sep 2025 03:02:57 -0700 Subject: [PATCH] Move `cards` and `filters` folder out of `game` (#6145) * big move * also move game_specific_terms * fix imports * alphabetize cmake * fix build failure * create database folder and move files into it * fix includes * run formatter --- cockatrice/CMakeLists.txt | 34 +++++++++---------- .../src/{game/cards => card}/card_info.cpp | 6 ++-- .../src/{game/cards => card}/card_info.h | 0 .../src/{game/cards => card}/exact_card.cpp | 0 .../src/{game/cards => card}/exact_card.h | 0 .../src/{game => card}/game_specific_terms.h | 0 cockatrice/src/client/network/sets_model.h | 2 +- .../network/spoiler_background_updater.cpp | 4 +-- .../client/tabs/abstract_tab_deck_editor.cpp | 4 +-- .../client/tabs/abstract_tab_deck_editor.h | 2 +- ...i_response_card_details_display_widget.cpp | 2 +- ...ponse_commander_details_display_widget.cpp | 2 +- .../src/client/tabs/api/edhrec/tab_edhrec.cpp | 2 +- .../src/client/tabs/api/edhrec/tab_edhrec.h | 2 +- .../tabs/api/edhrec/tab_edhrec_main.cpp | 6 ++-- .../client/tabs/api/edhrec/tab_edhrec_main.h | 2 +- .../src/client/tabs/tab_deck_editor.cpp | 8 ++--- cockatrice/src/client/tabs/tab_deck_editor.h | 2 +- cockatrice/src/client/tabs/tab_game.cpp | 4 +-- .../tab_deck_editor_visual.cpp | 4 +-- .../tab_deck_storage_visual.cpp | 2 +- cockatrice/src/client/tapped_out_interface.h | 2 +- .../client/ui/picture_loader/picture_loader.h | 2 +- .../picture_loader/picture_loader_local.cpp | 2 +- .../ui/picture_loader/picture_loader_local.h | 2 +- .../picture_loader/picture_loader_worker.cpp | 2 +- .../ui/picture_loader/picture_loader_worker.h | 4 +-- .../picture_loader_worker_work.cpp | 2 +- .../picture_loader_worker_work.h | 2 +- .../ui/picture_loader/picture_to_load.h | 2 +- .../additional_info/color_identity_widget.h | 2 +- .../cards/additional_info/mana_cost_widget.h | 2 +- .../card_group_display_widget.cpp | 2 +- .../card_group_display_widget.h | 2 +- .../flat_card_group_display_widget.cpp | 2 +- .../overlapped_card_group_display_widget.cpp | 2 +- .../cards/card_info_display_widget.cpp | 2 +- .../widgets/cards/card_info_display_widget.h | 2 +- .../widgets/cards/card_info_frame_widget.cpp | 2 +- .../ui/widgets/cards/card_info_frame_widget.h | 2 +- .../cards/card_info_picture_enlarged_widget.h | 2 +- .../cards/card_info_picture_widget.cpp | 2 +- .../widgets/cards/card_info_picture_widget.h | 2 +- .../widgets/cards/card_info_text_widget.cpp | 2 +- .../ui/widgets/cards/card_info_text_widget.h | 2 +- .../cards/deck_card_zone_display_widget.h | 2 +- .../deck_analytics/mana_base_widget.cpp | 4 +-- .../deck_analytics/mana_curve_widget.cpp | 4 +-- .../deck_analytics/mana_devotion_widget.cpp | 4 +-- .../deck_editor_database_display_widget.cpp | 4 +-- .../deck_editor_database_display_widget.h | 2 +- .../deck_editor_deck_dock_widget.cpp | 2 +- .../deck_editor_deck_dock_widget.h | 2 +- .../deck_editor_filter_dock_widget.cpp | 6 ++-- .../client/ui/widgets/general/home_widget.cpp | 2 +- .../printing_selector/card_amount_widget.h | 2 +- .../printing_selector/printing_selector.h | 2 +- .../printing_selector_card_display_widget.h | 2 +- .../printing_selector_card_overlay_widget.cpp | 2 +- .../printing_selector_card_overlay_widget.h | 2 +- ...l_database_display_color_filter_widget.cpp | 2 +- ...ual_database_display_color_filter_widget.h | 2 +- ...tabase_display_filter_save_load_widget.cpp | 2 +- ...database_display_filter_save_load_widget.h | 2 +- ...tabase_display_main_type_filter_widget.cpp | 6 ++-- ...database_display_main_type_filter_widget.h | 2 +- ...sual_database_display_name_filter_widget.h | 2 +- ...ual_database_display_set_filter_widget.cpp | 6 ++-- ...isual_database_display_set_filter_widget.h | 2 +- ...atabase_display_sub_type_filter_widget.cpp | 6 ++-- ..._database_display_sub_type_filter_widget.h | 2 +- .../visual_database_display_widget.cpp | 8 ++--- .../visual_database_display_widget.h | 6 ++-- .../visual_deck_editor_sample_hand_widget.cpp | 2 +- .../visual_deck_editor_widget.cpp | 10 +++--- .../visual_deck_editor_widget.h | 6 ++-- .../deck_preview/deck_preview_widget.cpp | 2 +- .../visual_deck_storage_search_widget.cpp | 4 +-- .../visual_deck_storage_widget.cpp | 2 +- cockatrice/src/client/ui/window_main.cpp | 4 +-- .../card_completer_proxy_model.cpp | 0 .../card_completer_proxy_model.h | 0 .../cards => database}/card_database.cpp | 10 +++--- .../{game/cards => database}/card_database.h | 2 +- .../card_database_manager.cpp | 0 .../card_database_manager.h | 0 .../card_database_model.cpp | 0 .../cards => database}/card_database_model.h | 0 .../cards => database}/card_search_model.cpp | 2 +- .../cards => database}/card_search_model.h | 0 .../parser}/card_database_parser.cpp | 0 .../parser}/card_database_parser.h | 2 +- .../parser}/cockatrice_xml_3.cpp | 0 .../parser}/cockatrice_xml_3.h | 0 .../parser}/cockatrice_xml_4.cpp | 2 +- .../parser}/cockatrice_xml_4.h | 0 cockatrice/src/deck/deck_list_model.cpp | 2 +- cockatrice/src/deck/deck_list_model.h | 2 +- cockatrice/src/deck/deck_loader.cpp | 4 +-- cockatrice/src/deck/deck_stats_interface.h | 2 +- cockatrice/src/dialogs/dlg_create_token.cpp | 4 +-- cockatrice/src/dialogs/dlg_edit_tokens.cpp | 6 ++-- cockatrice/src/dialogs/dlg_edit_tokens.h | 2 +- cockatrice/src/dialogs/dlg_manage_sets.cpp | 2 +- .../src/dialogs/dlg_move_top_cards_until.cpp | 6 ++-- .../src/dialogs/dlg_select_set_for_cards.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 4 +-- .../{game => }/filters/deck_filter_string.cpp | 2 +- .../{game => }/filters/deck_filter_string.h | 2 +- .../src/{game => }/filters/filter_builder.cpp | 2 +- .../src/{game => }/filters/filter_builder.h | 0 .../src/{game => }/filters/filter_card.cpp | 0 .../src/{game => }/filters/filter_card.h | 0 .../src/{game => }/filters/filter_string.cpp | 2 +- .../src/{game => }/filters/filter_string.h | 2 +- .../src/{game => }/filters/filter_tree.cpp | 0 .../src/{game => }/filters/filter_tree.h | 2 +- .../{game => }/filters/filter_tree_model.cpp | 0 .../{game => }/filters/filter_tree_model.h | 0 .../src/{game => }/filters/syntax_help.cpp | 0 .../src/{game => }/filters/syntax_help.h | 0 .../src/game/board/abstract_card_item.cpp | 4 +-- .../src/game/board/abstract_card_item.h | 2 +- cockatrice/src/game/board/arrow_item.cpp | 2 +- cockatrice/src/game/board/card_item.cpp | 2 +- cockatrice/src/game/board/card_list.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 2 +- .../src/game/deckview/deck_view_container.cpp | 4 +-- cockatrice/src/game/player/menu/card_menu.cpp | 2 +- .../src/game/player/menu/player_menu.cpp | 2 +- cockatrice/src/game/player/player.h | 4 +-- cockatrice/src/game/player/player_actions.cpp | 2 +- .../src/game/zones/logic/card_zone_logic.cpp | 2 +- cockatrice/src/game/zones/table_zone.cpp | 2 +- cockatrice/src/game/zones/view_zone.cpp | 2 +- cockatrice/src/game/zones/view_zone.h | 2 +- .../src/game/zones/view_zone_widget.cpp | 2 +- cockatrice/src/utility/card_info_comparator.h | 2 +- cockatrice/src/utility/card_set_comparator.h | 2 +- .../deck_list_sort_filter_proxy_model.h | 2 +- dbconverter/CMakeLists.txt | 12 +++---- dbconverter/src/main.h | 4 +-- dbconverter/src/mocks.h | 2 +- oracle/CMakeLists.txt | 8 ++--- oracle/src/oracleimporter.cpp | 2 +- oracle/src/oracleimporter.h | 2 +- tests/carddatabase/CMakeLists.txt | 32 ++++++++--------- tests/carddatabase/filter_string_test.cpp | 4 +-- tests/carddatabase/mocks.h | 2 +- 149 files changed, 218 insertions(+), 218 deletions(-) rename cockatrice/src/{game/cards => card}/card_info.cpp (98%) rename cockatrice/src/{game/cards => card}/card_info.h (100%) rename cockatrice/src/{game/cards => card}/exact_card.cpp (100%) rename cockatrice/src/{game/cards => card}/exact_card.h (100%) rename cockatrice/src/{game => card}/game_specific_terms.h (100%) rename cockatrice/src/{game/cards => database}/card_completer_proxy_model.cpp (100%) rename cockatrice/src/{game/cards => database}/card_completer_proxy_model.h (100%) rename cockatrice/src/{game/cards => database}/card_database.cpp (98%) rename cockatrice/src/{game/cards => database}/card_database.h (99%) rename cockatrice/src/{game/cards => database}/card_database_manager.cpp (100%) rename cockatrice/src/{game/cards => database}/card_database_manager.h (100%) rename cockatrice/src/{game/cards => database}/card_database_model.cpp (100%) rename cockatrice/src/{game/cards => database}/card_database_model.h (100%) rename cockatrice/src/{game/cards => database}/card_search_model.cpp (98%) rename cockatrice/src/{game/cards => database}/card_search_model.h (100%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/card_database_parser.cpp (100%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/card_database_parser.h (97%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/cockatrice_xml_3.cpp (100%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/cockatrice_xml_3.h (100%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/cockatrice_xml_4.cpp (99%) rename cockatrice/src/{game/cards/card_database_parser => database/parser}/cockatrice_xml_4.h (100%) rename cockatrice/src/{game => }/filters/deck_filter_string.cpp (99%) rename cockatrice/src/{game => }/filters/deck_filter_string.h (91%) rename cockatrice/src/{game => }/filters/filter_builder.cpp (98%) rename cockatrice/src/{game => }/filters/filter_builder.h (100%) rename cockatrice/src/{game => }/filters/filter_card.cpp (100%) rename cockatrice/src/{game => }/filters/filter_card.h (100%) rename cockatrice/src/{game => }/filters/filter_string.cpp (99%) rename cockatrice/src/{game => }/filters/filter_string.h (97%) rename cockatrice/src/{game => }/filters/filter_tree.cpp (100%) rename cockatrice/src/{game => }/filters/filter_tree.h (99%) rename cockatrice/src/{game => }/filters/filter_tree_model.cpp (100%) rename cockatrice/src/{game => }/filters/filter_tree_model.h (100%) rename cockatrice/src/{game => }/filters/syntax_help.cpp (100%) rename cockatrice/src/{game => }/filters/syntax_help.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index b34a41410..e02934128 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -7,6 +7,8 @@ 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/card/card_info.cpp + src/card/exact_card.cpp src/client/get_text_with_max.cpp src/client/menus/deck_editor/deck_editor_menu.cpp src/client/network/client_update_checker.cpp @@ -151,6 +153,14 @@ set(cockatrice_SOURCES src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/client/ui/window_main.cpp src/client/update_downloader.cpp + src/database/card_completer_proxy_model.cpp + src/database/card_database.cpp + src/database/card_database_manager.cpp + src/database/card_database_model.cpp + src/database/card_search_model.cpp + src/database/parser/card_database_parser.cpp + src/database/parser/cockatrice_xml_3.cpp + src/database/parser/cockatrice_xml_4.cpp src/deck/custom_line_edit.cpp src/deck/deck_list_model.cpp src/deck/deck_loader.cpp @@ -182,6 +192,13 @@ set(cockatrice_SOURCES src/dialogs/dlg_tip_of_the_day.cpp src/dialogs/dlg_update.cpp src/dialogs/dlg_view_log.cpp + src/filters/deck_filter_string.cpp + src/filters/filter_builder.cpp + src/filters/filter_card.cpp + src/filters/filter_string.cpp + src/filters/filter_tree.cpp + src/filters/filter_tree_model.cpp + src/filters/syntax_help.cpp src/game/board/abstract_card_drag_item.cpp src/game/board/abstract_card_item.cpp src/game/board/abstract_counter.cpp @@ -192,26 +209,9 @@ set(cockatrice_SOURCES src/game/board/card_item.cpp src/game/board/card_list.cpp src/game/board/counter_general.cpp - src/game/cards/card_completer_proxy_model.cpp - src/game/cards/card_database.cpp - src/game/cards/card_database_manager.cpp - src/game/cards/card_database_model.cpp - src/game/cards/card_database_parser/card_database_parser.cpp - src/game/cards/card_database_parser/cockatrice_xml_3.cpp - src/game/cards/card_database_parser/cockatrice_xml_4.cpp - src/game/cards/card_info.cpp - src/game/cards/card_search_model.cpp - src/game/cards/exact_card.cpp src/game/deckview/deck_view.cpp src/game/deckview/deck_view_container.cpp src/game/deckview/tabbed_deck_view_container.cpp - src/game/filters/deck_filter_string.cpp - src/game/filters/filter_builder.cpp - src/game/filters/filter_card.cpp - src/game/filters/filter_string.cpp - src/game/filters/filter_tree.cpp - src/game/filters/filter_tree_model.cpp - src/game/filters/syntax_help.cpp src/game/abstract_game.cpp src/game/game.cpp src/game/game_event_handler.cpp diff --git a/cockatrice/src/game/cards/card_info.cpp b/cockatrice/src/card/card_info.cpp similarity index 98% rename from cockatrice/src/game/cards/card_info.cpp rename to cockatrice/src/card/card_info.cpp index f5424cd4d..74ed3203e 100644 --- a/cockatrice/src/game/cards/card_info.cpp +++ b/cockatrice/src/card/card_info.cpp @@ -1,8 +1,8 @@ #include "card_info.h" -#include "../../client/ui/picture_loader/picture_loader.h" -#include "../../settings/cache_settings.h" -#include "../game_specific_terms.h" +#include "../client/ui/picture_loader/picture_loader.h" +#include "../settings/cache_settings.h" +#include "game_specific_terms.h" #include #include diff --git a/cockatrice/src/game/cards/card_info.h b/cockatrice/src/card/card_info.h similarity index 100% rename from cockatrice/src/game/cards/card_info.h rename to cockatrice/src/card/card_info.h diff --git a/cockatrice/src/game/cards/exact_card.cpp b/cockatrice/src/card/exact_card.cpp similarity index 100% rename from cockatrice/src/game/cards/exact_card.cpp rename to cockatrice/src/card/exact_card.cpp diff --git a/cockatrice/src/game/cards/exact_card.h b/cockatrice/src/card/exact_card.h similarity index 100% rename from cockatrice/src/game/cards/exact_card.h rename to cockatrice/src/card/exact_card.h diff --git a/cockatrice/src/game/game_specific_terms.h b/cockatrice/src/card/game_specific_terms.h similarity index 100% rename from cockatrice/src/game/game_specific_terms.h rename to cockatrice/src/card/game_specific_terms.h diff --git a/cockatrice/src/client/network/sets_model.h b/cockatrice/src/client/network/sets_model.h index 0bfbe57e0..70dea842e 100644 --- a/cockatrice/src/client/network/sets_model.h +++ b/cockatrice/src/client/network/sets_model.h @@ -1,7 +1,7 @@ #ifndef SETSMODEL_H #define SETSMODEL_H -#include "../../game/cards/card_database.h" +#include "../../database/card_database.h" #include #include diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp index a8a3a4b81..3e10b1bce 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/spoiler_background_updater.cpp @@ -1,7 +1,7 @@ #include "spoiler_background_updater.h" -#include "../../game/cards/card_database.h" -#include "../../game/cards/card_database_manager.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" #include "../../main.h" #include "../../settings/cache_settings.h" #include "../ui/window_main.h" diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index ce88a75c4..bf245ab30 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -2,12 +2,12 @@ #include "../../client/tapped_out_interface.h" #include "../../client/ui/widgets/cards/card_info_frame_widget.h" +#include "../../database/card_database_manager.h" +#include "../../database/card_database_model.h" #include "../../deck/deck_stats_interface.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_website.h" -#include "../../game/cards/card_database_manager.h" -#include "../../game/cards/card_database_model.h" #include "../../server/abstract_client.h" #include "../../server/pending_command.h" #include "../../settings/cache_settings.h" diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h index dd85028dc..e281e42e3 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h @@ -1,7 +1,7 @@ #ifndef TAB_GENERIC_DECK_EDITOR_H #define TAB_GENERIC_DECK_EDITOR_H -#include "../../game/cards/card_info.h" +#include "../../card/card_info.h" #include "../menus/deck_editor/deck_editor_menu.h" #include "../ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h" #include "../ui/widgets/deck_editor/deck_editor_database_display_widget.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp index 952599170..4687077a5 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_api_response_card_details_display_widget.h" -#include "../../../../../../game/cards/card_database_manager.h" +#include "../../../../../../database/card_database_manager.h" #include "../../tab_edhrec_main.h" EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( diff --git a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index 0d37dad69..93604a817 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_api_response_commander_details_display_widget.h" -#include "../../../../../../game/cards/card_database_manager.h" +#include "../../../../../../database/card_database_manager.h" #include "../../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../tab_edhrec_main.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp index a2755b9e1..4c740e5d1 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp @@ -44,7 +44,7 @@ void TabEdhRec::setCard(CardInfoPtr _cardToQuery, bool isCommander) if (isCommander) { url = QString("https://json.edhrec.com/pages/commanders/%1.json").arg(formattedName); } else { - url = QString("https://json.edhrec.com/pages/cards/%1.json").arg(formattedName); + url = QString("https://json.edhrec.com/pages/card/%1.json").arg(formattedName); } QNetworkRequest request{QUrl(url)}; diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h index ff299fadc..15468915e 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h @@ -1,7 +1,7 @@ #ifndef TAB_EDHREC_H #define TAB_EDHREC_H -#include "../../../../game/cards/card_info.h" +#include "../../../../card/card_info.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp index 1b1e90acb..975db8d24 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp @@ -1,8 +1,8 @@ #include "tab_edhrec_main.h" -#include "../../../../game/cards/card_completer_proxy_model.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/cards/card_search_model.h" +#include "../../../../database/card_completer_proxy_model.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../database/card_search_model.h" #include "../../tab_supervisor.h" #include "api_response/average_deck/edhrec_average_deck_api_response.h" #include "api_response/commander/edhrec_commander_api_response.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h index 814a7823b..b9fdfd4c7 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h @@ -1,7 +1,7 @@ #ifndef TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H -#include "../../../../game/cards/card_database.h" +#include "../../../../database/card_database.h" #include "../../../ui/widgets/cards/card_size_widget.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../ui/widgets/quick_settings/settings_button_widget.h" diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp index 4f32cd97e..55f6920bd 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp @@ -2,12 +2,12 @@ #include "../../client/tapped_out_interface.h" #include "../../client/ui/widgets/cards/card_info_frame_widget.h" +#include "../../database/card_database_manager.h" +#include "../../database/card_database_model.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" -#include "../../game/cards/card_database_manager.h" -#include "../../game/cards/card_database_model.h" -#include "../../game/filters/filter_builder.h" -#include "../../game/filters/filter_tree_model.h" +#include "../../filters/filter_builder.h" +#include "../../filters/filter_tree_model.h" #include "../../server/abstract_client.h" #include "../../server/pending_command.h" #include "../../settings/cache_settings.h" diff --git a/cockatrice/src/client/tabs/tab_deck_editor.h b/cockatrice/src/client/tabs/tab_deck_editor.h index c5a7f5302..3ff4dd6e1 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.h +++ b/cockatrice/src/client/tabs/tab_deck_editor.h @@ -1,7 +1,7 @@ #ifndef WINDOW_DECKEDITOR_H #define WINDOW_DECKEDITOR_H -#include "../../game/cards/card_info.h" +#include "../../card/card_info.h" #include "../../utility/key_signals.h" #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "abstract_tab_deck_editor.h" diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index 1e4bd1fc3..6ffb6668d 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -1,11 +1,11 @@ #include "tab_game.h" #include "../../client/ui/widgets/cards/card_info_frame_widget.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" #include "../../dialogs/dlg_create_game.h" #include "../../game/board/arrow_item.h" #include "../../game/board/card_item.h" -#include "../../game/cards/card_database.h" -#include "../../game/cards/card_database_manager.h" #include "../../game/deckview/deck_view_container.h" #include "../../game/deckview/tabbed_deck_view_container.h" #include "../../game/game.h" diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index ee9350f6f..44277bfd4 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,9 +1,9 @@ #include "tab_deck_editor_visual.h" +#include "../../../database/card_database_model.h" #include "../../../deck/deck_list_model.h" #include "../../../deck/deck_stats_interface.h" -#include "../../../game/cards/card_database_model.h" -#include "../../../game/filters/filter_builder.h" +#include "../../../filters/filter_builder.h" #include "../../../server/pending_command.h" #include "../../../settings/cache_settings.h" #include "../../ui/pixel_map_generator.h" diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index 65b4fcab0..afe3ddb13 100644 --- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -1,6 +1,6 @@ #include "tab_deck_storage_visual.h" -#include "../../../game/cards/card_database_model.h" +#include "../../../database/card_database_model.h" #include "../../ui/widgets/cards/deck_preview_card_picture_widget.h" #include "../../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../tab_supervisor.h" diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index 675901245..b9eaddb23 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -1,7 +1,7 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H -#include "../game/cards/card_database.h" +#include "../database/card_database.h" #include "deck_list.h" #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader.h b/cockatrice/src/client/ui/picture_loader/picture_loader.h index 43dde56c7..cf8132448 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader.h @@ -1,7 +1,7 @@ #ifndef PICTURELOADER_H #define PICTURELOADER_H -#include "../../../game/cards/card_info.h" +#include "../../../card/card_info.h" #include "picture_loader_status_bar.h" #include "picture_loader_worker.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp index 93de59a78..e71125b12 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp @@ -1,6 +1,6 @@ #include "picture_loader_local.h" -#include "../../../game/cards/card_database_manager.h" +#include "../../../database/card_database_manager.h" #include "../../../settings/cache_settings.h" #include "picture_to_load.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h index a493c46df..ba87456f2 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h @@ -1,7 +1,7 @@ #ifndef PICTURE_LOADER_LOCAL_H #define PICTURE_LOADER_LOCAL_H -#include "../../../game/cards/exact_card.h" +#include "../../../card/exact_card.h" #include #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp index 26cf09156..feffc7376 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp @@ -1,6 +1,6 @@ #include "picture_loader_worker.h" -#include "../../../game/cards/card_database_manager.h" +#include "../../../database/card_database_manager.h" #include "../../../settings/cache_settings.h" #include "picture_loader_local.h" #include "picture_loader_worker_work.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h index f7a31baef..b9799ab39 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h @@ -1,8 +1,8 @@ #ifndef PICTURE_LOADER_WORKER_H #define PICTURE_LOADER_WORKER_H -#include "../../../game/cards/card_database.h" -#include "../../../game/cards/card_info.h" +#include "../../../card/card_info.h" +#include "../../../database/card_database.h" #include "picture_loader_local.h" #include "picture_loader_worker_work.h" #include "picture_to_load.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp index 0f31297ab..c51e1d11f 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp @@ -1,6 +1,6 @@ #include "picture_loader_worker_work.h" -#include "../../../game/cards/card_database_manager.h" +#include "../../../database/card_database_manager.h" #include "../../../settings/cache_settings.h" #include "picture_loader_worker.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h index a323c2f1d..8d09e091f 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h @@ -1,7 +1,7 @@ #ifndef PICTURE_LOADER_WORKER_WORK_H #define PICTURE_LOADER_WORKER_WORK_H -#include "../../../game/cards/card_database.h" +#include "../../../database/card_database.h" #include "picture_loader_worker.h" #include "picture_to_load.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_to_load.h b/cockatrice/src/client/ui/picture_loader/picture_to_load.h index a099ac071..309ff1870 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_to_load.h +++ b/cockatrice/src/client/ui/picture_loader/picture_to_load.h @@ -1,7 +1,7 @@ #ifndef PICTURE_TO_LOAD_H #define PICTURE_TO_LOAD_H -#include "../../../game/cards/exact_card.h" +#include "../../../card/exact_card.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h index 9b8fef71c..2e90b6973 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h @@ -1,7 +1,7 @@ #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H -#include "../../../../../game/cards/card_info.h" +#include "../../../../../card/card_info.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h index c9ed221be..066f975d6 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h @@ -1,7 +1,7 @@ #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H -#include "../../../../../game/cards/card_info.h" +#include "../../../../../card/card_info.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 8dfa095ef..b9c38363e 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -1,7 +1,7 @@ #include "card_group_display_widget.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.h" -#include "../../../../../game/cards/card_database_manager.h" #include "../../../../../utility/card_info_comparator.h" #include "../../../../../utility/deck_list_sort_filter_proxy_model.h" #include "../card_info_picture_with_text_overlay_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h index ae5ca9eac..dea782255 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -1,8 +1,8 @@ #ifndef CARD_GROUP_DISPLAY_WIDGET_H #define CARD_GROUP_DISPLAY_WIDGET_H +#include "../../../../../card/card_info.h" #include "../../../../../deck/deck_list_model.h" -#include "../../../../../game/cards/card_info.h" #include "../../general/display/banner_widget.h" #include "../card_info_picture_with_text_overlay_widget.h" #include "../card_size_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 583b383de..6100eac09 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -1,7 +1,7 @@ #include "flat_card_group_display_widget.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.h" -#include "../../../../../game/cards/card_database_manager.h" #include "../../../../../utility/card_info_comparator.h" #include "../card_info_picture_with_text_overlay_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index 658d3eccf..0caec281e 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -1,7 +1,7 @@ #include "overlapped_card_group_display_widget.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.h" -#include "../../../../../game/cards/card_database_manager.h" #include "../../../../../utility/card_info_comparator.h" #include "../card_info_picture_with_text_overlay_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp index 28209e6ec..729fbc743 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_display_widget.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../main.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h index 0df6081eb..3d67c1036 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h @@ -1,7 +1,7 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H -#include "../../../../game/cards/exact_card.h" +#include "../../../../card/exact_card.h" #include "card_ref.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp index 55018ad27..dc405ff0f 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_frame_widget.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h index 147ff85ce..4848fb54d 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h @@ -1,7 +1,7 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include "../../../../game/cards/exact_card.h" +#include "../../../../card/exact_card.h" #include "card_ref.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h index 0d1bf9c01..7344547df 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h @@ -1,7 +1,7 @@ #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H -#include "../../../../game/cards/exact_card.h" +#include "../../../../card/exact_card.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp index 03766d1b4..1fc98e986 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_picture_widget.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.h" #include "../../picture_loader/picture_loader.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h index 859251c9f..92822489f 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h @@ -1,7 +1,7 @@ #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H -#include "../../../../game/cards/exact_card.h" +#include "../../../../card/exact_card.h" #include "card_info_picture_enlarged_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp index 5201bea2c..9c954f8ad 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_text_widget.h" +#include "../../../../card/game_specific_terms.h" #include "../../../../game/board/card_item.h" -#include "../../../../game/game_specific_terms.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h index e066fdb34..f2ef4cb81 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h @@ -1,7 +1,7 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include "../../../../game/cards/card_info.h" +#include "../../../../card/card_info.h" #include class QLabel; diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h index 27b0d132b..28995bfba 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H #define DECK_CARD_ZONE_DISPLAY_WIDGET_H +#include "../../../../card/card_info.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_info.h" #include "../general/display/banner_widget.h" #include "../general/layout_containers/overlap_widget.h" #include "../visual_deck_editor/visual_deck_editor_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp index 20628581a..49caab285 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp @@ -1,8 +1,8 @@ #include "mana_base_widget.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_manager.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp index abe1e17de..5a191ee37 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp @@ -1,8 +1,8 @@ #include "mana_curve_widget.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp index 5071ebd7d..15acefe8f 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp @@ -1,8 +1,8 @@ #include "mana_devotion_widget.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp index 6461eb833..3b13ba21e 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -1,7 +1,7 @@ #include "deck_editor_database_display_widget.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/filters/syntax_help.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../filters/syntax_help.h" #include "../../../../settings/cache_settings.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/tab_supervisor.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h index 4df021087..b47835e6a 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H +#include "../../../../database/card_database_model.h" #include "../../../../deck/custom_line_edit.h" -#include "../../../../game/cards/card_database_model.h" #include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 5bff6fdbe..5daa69afd 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -1,6 +1,6 @@ #include "deck_editor_deck_dock_widget.h" -#include "../../../../game/cards/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h index 1da78e3c7..92f49d1f6 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H +#include "../../../../card/card_info.h" #include "../../../../deck/custom_line_edit.h" -#include "../../../../game/cards/card_info.h" #include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 99d0e4829..733b321ef 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -1,8 +1,8 @@ #include "deck_editor_filter_dock_widget.h" -#include "../../../../game/cards/card_database_model.h" -#include "../../../../game/filters/filter_builder.h" -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../database/card_database_model.h" +#include "../../../../filters/filter_builder.h" +#include "../../../../filters/filter_tree_model.h" #include "../../../../settings/cache_settings.h" #include diff --git a/cockatrice/src/client/ui/widgets/general/home_widget.cpp b/cockatrice/src/client/ui/widgets/general/home_widget.cpp index 717bbbf75..823c718b0 100644 --- a/cockatrice/src/client/ui/widgets/general/home_widget.cpp +++ b/cockatrice/src/client/ui/widgets/general/home_widget.cpp @@ -1,6 +1,6 @@ #include "home_widget.h" -#include "../../../../game/cards/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../server/remote/remote_client.h" #include "../../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h index 678bbbe76..111f3bfd7 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h @@ -1,9 +1,9 @@ #ifndef CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H +#include "../../../../card/card_info.h" #include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_info.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../general/display/dynamic_font_size_push_button.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h index f22dece93..799d6da7f 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h @@ -1,8 +1,8 @@ #ifndef PRINTING_SELECTOR_H #define PRINTING_SELECTOR_H +#include "../../../../card/card_info.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_info.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../quick_settings/settings_button_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h index 73bcda966..f1dd32b63 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h @@ -1,8 +1,8 @@ #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H +#include "../../../../card/card_info.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_info.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "printing_selector_card_overlay_widget.h" #include "set_name_and_collectors_number_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 647ca2054..222ba2b09 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,6 +1,6 @@ #include "printing_selector_card_overlay_widget.h" -#include "../../../../game/cards/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include "printing_selector_card_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h index 24fc3d002..eb8e97aa1 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -1,9 +1,9 @@ #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H +#include "../../../../card/card_info.h" #include "../../../../client/ui/widgets/cards/card_info_picture_widget.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_info.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "all_zones_card_amount_widget.h" #include "card_amount_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp index e93253585..8fbdd8644 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_display_color_filter_widget.h" -#include "../../../../game/filters/filter_tree.h" +#include "../../../../filters/filter_tree.h" #include "../cards/additional_info/mana_symbol_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h index 3936c8843..c739afe21 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index b97032126..12d77dc91 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_display_filter_save_load_widget.h" -#include "../../../../game/filters/filter_tree.h" +#include "../../../../filters/filter_tree.h" #include "../../../../settings/cache_settings.h" #include "visual_database_filter_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h index 52b2af2bf..b52ef4273 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp index 8cf9c6605..0e5fecef3 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp @@ -1,8 +1,8 @@ #include "visual_database_display_main_type_filter_widget.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/filters/filter_tree.h" -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../filters/filter_tree.h" +#include "../../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h index 07086bbe3..44af509be 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.h index b0989c5d7..95dd6a25e 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../general/layout_containers/flow_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp index a79ef9ff6..4139ead46 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp @@ -1,8 +1,8 @@ #include "visual_database_display_set_filter_widget.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/filters/filter_tree.h" -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../filters/filter_tree.h" +#include "../../../../filters/filter_tree_model.h" #include "../../../../settings/cache_settings.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h index 9079850ca..9a4472ee4 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp index c6ea811a9..f62a8b0be 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp @@ -1,8 +1,8 @@ #include "visual_database_display_sub_type_filter_widget.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/filters/filter_tree.h" -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../filters/filter_tree.h" +#include "../../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h index 64c9c19cd..db9328f81 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index ab0f1b2db..2d6901add 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -1,10 +1,10 @@ #include "visual_database_display_widget.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/custom_line_edit.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/filters/filter_tree_model.h" -#include "../../../../game/filters/syntax_help.h" +#include "../../../../filters/filter_tree_model.h" +#include "../../../../filters/syntax_help.h" #include "../../../../settings/cache_settings.h" #include "../../../../utility/card_info_comparator.h" #include "../../pixel_map_generator.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h index c8b80aa46..35604aa1a 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h @@ -1,11 +1,11 @@ #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_model.h" #include "../../../../deck/custom_line_edit.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_model.h" -#include "../../../../game/filters/filter_tree_model.h" +#include "../../../../filters/filter_tree_model.h" #include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../layouts/flow_layout.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index 7f58530e3..170da56dc 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_editor_sample_hand_widget.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include "../cards/card_info_picture_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index a8704f65b..fef993a26 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -1,12 +1,12 @@ #include "visual_deck_editor_widget.h" +#include "../../../../database/card_completer_proxy_model.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../database/card_database_model.h" +#include "../../../../database/card_search_model.h" #include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_loader.h" -#include "../../../../game/cards/card_completer_proxy_model.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../../../../game/cards/card_database_model.h" -#include "../../../../game/cards/card_search_model.h" #include "../../../../main.h" #include "../../../../utility/card_info_comparator.h" #include "../../layouts/overlap_layout.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h index 6f114dc63..b8b6a513a 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -1,10 +1,10 @@ #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H +#include "../../../../database/card_completer_proxy_model.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_model.h" #include "../../../../deck/deck_list_model.h" -#include "../../../../game/cards/card_completer_proxy_model.h" -#include "../../../../game/cards/card_database.h" -#include "../../../../game/cards/card_database_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" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 29c536d67..208fd2212 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -1,6 +1,6 @@ #include "deck_preview_widget.h" -#include "../../../../../game/cards/card_database_manager.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../settings/cache_settings.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 560e3c6c9..04fd0da7c 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_storage_search_widget.h" -#include "../../../../game/filters/deck_filter_string.h" -#include "../../../../game/filters/syntax_help.h" +#include "../../../../filters/deck_filter_string.h" +#include "../../../../filters/syntax_help.h" #include "../../../../settings/cache_settings.h" #include "../../pixel_map_generator.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 078b9337f..47a2a8b9d 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_widget.h" -#include "../../../../game/cards/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../settings/cache_settings.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_widget.h" diff --git a/cockatrice/src/client/ui/window_main.cpp b/cockatrice/src/client/ui/window_main.cpp index e3b0066e9..e6b54a8a6 100644 --- a/cockatrice/src/client/ui/window_main.cpp +++ b/cockatrice/src/client/ui/window_main.cpp @@ -19,6 +19,8 @@ ***************************************************************************/ #include "window_main.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" #include "../../dialogs/dlg_connect.h" #include "../../dialogs/dlg_edit_tokens.h" #include "../../dialogs/dlg_forgot_password_challenge.h" @@ -31,8 +33,6 @@ #include "../../dialogs/dlg_tip_of_the_day.h" #include "../../dialogs/dlg_update.h" #include "../../dialogs/dlg_view_log.h" -#include "../../game/cards/card_database.h" -#include "../../game/cards/card_database_manager.h" #include "../../main.h" #include "../../server/local_client.h" #include "../../server/local_server.h" diff --git a/cockatrice/src/game/cards/card_completer_proxy_model.cpp b/cockatrice/src/database/card_completer_proxy_model.cpp similarity index 100% rename from cockatrice/src/game/cards/card_completer_proxy_model.cpp rename to cockatrice/src/database/card_completer_proxy_model.cpp diff --git a/cockatrice/src/game/cards/card_completer_proxy_model.h b/cockatrice/src/database/card_completer_proxy_model.h similarity index 100% rename from cockatrice/src/game/cards/card_completer_proxy_model.h rename to cockatrice/src/database/card_completer_proxy_model.h diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/database/card_database.cpp similarity index 98% rename from cockatrice/src/game/cards/card_database.cpp rename to cockatrice/src/database/card_database.cpp index 35d30549e..294b8e659 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/database/card_database.cpp @@ -1,10 +1,10 @@ #include "card_database.h" -#include "../../client/ui/picture_loader/picture_loader.h" -#include "../../settings/cache_settings.h" -#include "../../utility/card_set_comparator.h" -#include "./card_database_parser/cockatrice_xml_3.h" -#include "./card_database_parser/cockatrice_xml_4.h" +#include "../client/ui/picture_loader/picture_loader.h" +#include "../settings/cache_settings.h" +#include "../utility/card_set_comparator.h" +#include "./parser/cockatrice_xml_3.h" +#include "./parser/cockatrice_xml_4.h" #include #include diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/database/card_database.h similarity index 99% rename from cockatrice/src/game/cards/card_database.h rename to cockatrice/src/database/card_database.h index 1f453d95f..ecfb850ac 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/database/card_database.h @@ -1,8 +1,8 @@ #ifndef CARDDATABASE_H #define CARDDATABASE_H +#include "../card/exact_card.h" #include "../common/card_ref.h" -#include "exact_card.h" #include #include diff --git a/cockatrice/src/game/cards/card_database_manager.cpp b/cockatrice/src/database/card_database_manager.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_manager.cpp rename to cockatrice/src/database/card_database_manager.cpp diff --git a/cockatrice/src/game/cards/card_database_manager.h b/cockatrice/src/database/card_database_manager.h similarity index 100% rename from cockatrice/src/game/cards/card_database_manager.h rename to cockatrice/src/database/card_database_manager.h diff --git a/cockatrice/src/game/cards/card_database_model.cpp b/cockatrice/src/database/card_database_model.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_model.cpp rename to cockatrice/src/database/card_database_model.cpp diff --git a/cockatrice/src/game/cards/card_database_model.h b/cockatrice/src/database/card_database_model.h similarity index 100% rename from cockatrice/src/game/cards/card_database_model.h rename to cockatrice/src/database/card_database_model.h diff --git a/cockatrice/src/game/cards/card_search_model.cpp b/cockatrice/src/database/card_search_model.cpp similarity index 98% rename from cockatrice/src/game/cards/card_search_model.cpp rename to cockatrice/src/database/card_search_model.cpp index 56b5ea530..e1240cecf 100644 --- a/cockatrice/src/game/cards/card_search_model.cpp +++ b/cockatrice/src/database/card_search_model.cpp @@ -1,6 +1,6 @@ #include "card_search_model.h" -#include "../../utility/levenshtein.h" +#include "../utility/levenshtein.h" #include diff --git a/cockatrice/src/game/cards/card_search_model.h b/cockatrice/src/database/card_search_model.h similarity index 100% rename from cockatrice/src/game/cards/card_search_model.h rename to cockatrice/src/database/card_search_model.h diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp b/cockatrice/src/database/parser/card_database_parser.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp rename to cockatrice/src/database/parser/card_database_parser.cpp diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h b/cockatrice/src/database/parser/card_database_parser.h similarity index 97% rename from cockatrice/src/game/cards/card_database_parser/card_database_parser.h rename to cockatrice/src/database/parser/card_database_parser.h index b7ef36636..9b3950427 100644 --- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h +++ b/cockatrice/src/database/parser/card_database_parser.h @@ -1,7 +1,7 @@ #ifndef CARDDATABASE_PARSER_H #define CARDDATABASE_PARSER_H -#include "../card_info.h" +#include "../../card/card_info.h" #include #include diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp b/cockatrice/src/database/parser/cockatrice_xml_3.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp rename to cockatrice/src/database/parser/cockatrice_xml_3.cpp diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h b/cockatrice/src/database/parser/cockatrice_xml_3.h similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h rename to cockatrice/src/database/parser/cockatrice_xml_3.h diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp b/cockatrice/src/database/parser/cockatrice_xml_4.cpp similarity index 99% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp rename to cockatrice/src/database/parser/cockatrice_xml_4.cpp index f9f6a98d4..a623c1253 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp +++ b/cockatrice/src/database/parser/cockatrice_xml_4.cpp @@ -1,6 +1,6 @@ #include "cockatrice_xml_4.h" -#include "../../../settings/cache_settings.h" +#include "../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h b/cockatrice/src/database/parser/cockatrice_xml_4.h similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h rename to cockatrice/src/database/parser/cockatrice_xml_4.h diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index b7be03a06..0733b2e69 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/cockatrice/src/deck/deck_list_model.cpp @@ -1,6 +1,6 @@ #include "deck_list_model.h" -#include "../game/cards/card_database_manager.h" +#include "../database/card_database_manager.h" #include "../main.h" #include "../settings/cache_settings.h" #include "deck_loader.h" diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index dd9101626..de9790c61 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,7 +1,7 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "../game/cards/exact_card.h" +#include "../card/exact_card.h" #include "abstract_deck_list_card_node.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 8eea89a63..b2aeb1642 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,7 +1,7 @@ #include "deck_loader.h" -#include "../game/cards/card_database.h" -#include "../game/cards/card_database_manager.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" #include "../main.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index 4704b143e..80a8a0770 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -1,7 +1,7 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H -#include "../game/cards/card_database.h" +#include "../database/card_database.h" #include "deck_list.h" #include diff --git a/cockatrice/src/dialogs/dlg_create_token.cpp b/cockatrice/src/dialogs/dlg_create_token.cpp index 07d61908b..a92594979 100644 --- a/cockatrice/src/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/dialogs/dlg_create_token.cpp @@ -1,8 +1,8 @@ #include "dlg_create_token.h" #include "../client/ui/widgets/cards/card_info_picture_widget.h" -#include "../game/cards/card_database_manager.h" -#include "../game/cards/card_database_model.h" +#include "../database/card_database_manager.h" +#include "../database/card_database_model.h" #include "../main.h" #include "../settings/cache_settings.h" #include "deck_list.h" diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index 83a27cc6a..2c302d774 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -1,9 +1,9 @@ #include "dlg_edit_tokens.h" #include "../client/get_text_with_max.h" -#include "../game/cards/card_database.h" -#include "../game/cards/card_database_manager.h" -#include "../game/cards/card_database_model.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" +#include "../database/card_database_model.h" #include "../main.h" #include "trice_limits.h" diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h index a008010bd..be09032da 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.h +++ b/cockatrice/src/dialogs/dlg_edit_tokens.h @@ -1,7 +1,7 @@ #ifndef DLG_EDIT_TOKENS_H #define DLG_EDIT_TOKENS_H -#include "../game/cards/card_info.h" +#include "../card/card_info.h" #include diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index d0693da41..b6ed4c5ad 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -2,8 +2,8 @@ #include "../client/network/sets_model.h" #include "../client/ui/picture_loader/picture_loader.h" +#include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" -#include "../game/cards/card_database_manager.h" #include "../main.h" #include "../settings/cache_settings.h" diff --git a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp index edf593571..23d8e22db 100644 --- a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp @@ -1,8 +1,8 @@ #include "dlg_move_top_cards_until.h" -#include "../game/cards/card_database.h" -#include "../game/cards/card_database_manager.h" -#include "../game/filters/filter_string.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" +#include "../filters/filter_string.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 8e139bdff..53375f92e 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -2,8 +2,8 @@ #include "../client/ui/widgets/cards/card_info_picture_widget.h" #include "../client/ui/widgets/general/layout_containers/flow_widget.h" +#include "../database/card_database_manager.h" #include "../deck/deck_loader.h" -#include "../game/cards/card_database_manager.h" #include "dlg_select_set_for_cards.h" #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 4efe44021..1c79d1cff 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -8,9 +8,9 @@ #include "../client/ui/picture_loader/picture_loader.h" #include "../client/ui/theme_manager.h" #include "../client/ui/widgets/general/background_sources.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" -#include "../game/cards/card_database.h" -#include "../game/cards/card_database_manager.h" #include "../main.h" #include "../settings/cache_settings.h" #include "../settings/card_counter_settings.h" diff --git a/cockatrice/src/game/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp similarity index 99% rename from cockatrice/src/game/filters/deck_filter_string.cpp rename to cockatrice/src/filters/deck_filter_string.cpp index 5ce8c8ed5..42c7e2cbc 100644 --- a/cockatrice/src/game/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,6 +1,6 @@ #include "deck_filter_string.h" -#include "../cards/card_database_manager.h" +#include "../database/card_database_manager.h" #include "filter_string.h" #include "lib/peglib.h" diff --git a/cockatrice/src/game/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h similarity index 91% rename from cockatrice/src/game/filters/deck_filter_string.h rename to cockatrice/src/filters/deck_filter_string.h index df6eac783..a7ab8601e 100644 --- a/cockatrice/src/game/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -1,7 +1,7 @@ #ifndef DECK_FILTER_STRING_H #define DECK_FILTER_STRING_H -#include "../../client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h" +#include "../client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h" #include #include diff --git a/cockatrice/src/game/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp similarity index 98% rename from cockatrice/src/game/filters/filter_builder.cpp rename to cockatrice/src/filters/filter_builder.cpp index 461da6841..97056ac60 100644 --- a/cockatrice/src/game/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 "../deck/custom_line_edit.h" #include "filter_card.h" #include diff --git a/cockatrice/src/game/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h similarity index 100% rename from cockatrice/src/game/filters/filter_builder.h rename to cockatrice/src/filters/filter_builder.h diff --git a/cockatrice/src/game/filters/filter_card.cpp b/cockatrice/src/filters/filter_card.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_card.cpp rename to cockatrice/src/filters/filter_card.cpp diff --git a/cockatrice/src/game/filters/filter_card.h b/cockatrice/src/filters/filter_card.h similarity index 100% rename from cockatrice/src/game/filters/filter_card.h rename to cockatrice/src/filters/filter_card.h diff --git a/cockatrice/src/game/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp similarity index 99% rename from cockatrice/src/game/filters/filter_string.cpp rename to cockatrice/src/filters/filter_string.cpp index 3d168d64c..02fc1e1ec 100644 --- a/cockatrice/src/game/filters/filter_string.cpp +++ b/cockatrice/src/filters/filter_string.cpp @@ -1,6 +1,6 @@ #include "filter_string.h" -#include "../../../../common/lib/peglib.h" +#include "../../../common/lib/peglib.h" #include #include diff --git a/cockatrice/src/game/filters/filter_string.h b/cockatrice/src/filters/filter_string.h similarity index 97% rename from cockatrice/src/game/filters/filter_string.h rename to cockatrice/src/filters/filter_string.h index 131c9f7bf..149710d00 100644 --- a/cockatrice/src/game/filters/filter_string.h +++ b/cockatrice/src/filters/filter_string.h @@ -1,7 +1,7 @@ #ifndef FILTER_STRING_H #define FILTER_STRING_H -#include "../cards/card_info.h" +#include "../card/card_info.h" #include "filter_tree.h" #include diff --git a/cockatrice/src/game/filters/filter_tree.cpp b/cockatrice/src/filters/filter_tree.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_tree.cpp rename to cockatrice/src/filters/filter_tree.cpp diff --git a/cockatrice/src/game/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h similarity index 99% rename from cockatrice/src/game/filters/filter_tree.h rename to cockatrice/src/filters/filter_tree.h index 394e98e7b..a1c015e20 100644 --- a/cockatrice/src/game/filters/filter_tree.h +++ b/cockatrice/src/filters/filter_tree.h @@ -1,7 +1,7 @@ #ifndef FILTERTREE_H #define FILTERTREE_H -#include "../cards/card_database.h" +#include "../database/card_database.h" #include "filter_card.h" #include diff --git a/cockatrice/src/game/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_tree_model.cpp rename to cockatrice/src/filters/filter_tree_model.cpp diff --git a/cockatrice/src/game/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h similarity index 100% rename from cockatrice/src/game/filters/filter_tree_model.h rename to cockatrice/src/filters/filter_tree_model.h diff --git a/cockatrice/src/game/filters/syntax_help.cpp b/cockatrice/src/filters/syntax_help.cpp similarity index 100% rename from cockatrice/src/game/filters/syntax_help.cpp rename to cockatrice/src/filters/syntax_help.cpp diff --git a/cockatrice/src/game/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h similarity index 100% rename from cockatrice/src/game/filters/syntax_help.h rename to cockatrice/src/filters/syntax_help.h diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 12c180da9..5fa3a71be 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -1,9 +1,9 @@ #include "abstract_card_item.h" #include "../../client/ui/picture_loader/picture_loader.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" #include "../../settings/cache_settings.h" -#include "../cards/card_database.h" -#include "../cards/card_database_manager.h" #include "../game_scene.h" #include diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h index 50b0ee2c9..755735383 100644 --- a/cockatrice/src/game/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -1,7 +1,7 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H -#include "../cards/exact_card.h" +#include "../../card/exact_card.h" #include "arrow_target.h" #include "card_ref.h" #include "graphics_item_type.h" diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index 1763d26d7..819fb7927 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -1,8 +1,8 @@ #define _USE_MATH_DEFINES #include "arrow_item.h" +#include "../../card/card_info.h" #include "../../settings/cache_settings.h" -#include "../cards/card_info.h" #include "../player/player.h" #include "../player/player_target.h" #include "../zones/card_zone.h" diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index e3b985f11..98a745fd1 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,9 +1,9 @@ #include "card_item.h" +#include "../../card/card_info.h" #include "../../client/tabs/tab_game.h" #include "../../settings/cache_settings.h" #include "../../settings/card_counter_settings.h" -#include "../cards/card_info.h" #include "../game_scene.h" #include "../player/player.h" #include "../zones/card_zone.h" diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp index 7ad6e3b30..7ad9048c3 100644 --- a/cockatrice/src/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,6 +1,6 @@ #include "card_list.h" -#include "../cards/card_info.h" +#include "../../card/card_info.h" #include "card_item.h" #include diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index afc35e77a..3c95027bd 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,7 +1,7 @@ #include "deck_view.h" +#include "../../card/card_info.h" #include "../../client/ui/theme_manager.h" -#include "../../game/cards/card_info.h" #include "../../settings/cache_settings.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index f09ecb638..103ab49d2 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -2,6 +2,8 @@ #include "../../client/tabs/tab_game.h" #include "../../client/ui/picture_loader/picture_loader.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" #include "../../deck/deck_loader.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" @@ -9,8 +11,6 @@ #include "../../dialogs/dlg_load_remote_deck.h" #include "../../server/pending_command.h" #include "../../settings/cache_settings.h" -#include "../cards/card_database.h" -#include "../cards/card_database_manager.h" #include "../game_scene.h" #include "deck_view.h" #include "pb/command_deck_select.pb.h" diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 4b45fce7d..bf3ab5375 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,9 +1,9 @@ #include "card_menu.h" #include "../../../client/tabs/tab_game.h" +#include "../../../database/card_database_manager.h" #include "../../../settings/card_counter_settings.h" #include "../../board/card_item.h" -#include "../../cards/card_database_manager.h" #include "../../zones/logic/view_zone_logic.h" #include "../card_menu_action_type.h" #include "../player.h" diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index 0c13dddc2..d6abb3168 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -2,8 +2,8 @@ #include "../../../client/tabs/tab_game.h" #include "../../../common/pb/command_reveal_cards.pb.h" +#include "../../../database/card_database_manager.h" #include "../../board/card_item.h" -#include "../../cards/card_database_manager.h" #include "../../zones/hand_zone.h" #include "../card_menu_action_type.h" #include "../player_actions.h" diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 255c9ab8b..acc262d01 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -1,11 +1,11 @@ #ifndef PLAYER_H #define PLAYER_H +#include "../../card/card_info.h" #include "../../client/tearoff_menu.h" #include "../../dialogs/dlg_create_token.h" +#include "../../filters/filter_string.h" #include "../board/abstract_graphics_item.h" -#include "../cards/card_info.h" -#include "../filters/filter_string.h" #include "menu/player_menu.h" #include "pb/card_attributes.pb.h" #include "pb/game_event.pb.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index c98e6eda4..4f9a79843 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -3,10 +3,10 @@ #include "../../../common/pb/context_move_card.pb.h" #include "../../client/get_text_with_max.h" #include "../../client/tabs/tab_game.h" +#include "../../database/card_database_manager.h" #include "../../dialogs/dlg_move_top_cards_until.h" #include "../../dialogs/dlg_roll_dice.h" #include "../board/card_item.h" -#include "../cards/card_database_manager.h" #include "../zones/logic/view_zone_logic.h" #include "card_menu_action_type.h" #include "pb/command_attach_card.pb.h" diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index ae91f9e7f..70cb21b8e 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -1,7 +1,7 @@ #include "card_zone_logic.h" +#include "../../../database/card_database_manager.h" #include "../../board/card_item.h" -#include "../../cards/card_database_manager.h" #include "../../player/player.h" #include "../pile_zone.h" #include "../view_zone.h" diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index 8505825f8..c46ff91de 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,11 +1,11 @@ #include "table_zone.h" +#include "../../card/card_info.h" #include "../../client/ui/theme_manager.h" #include "../../settings/cache_settings.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" -#include "../cards/card_info.h" #include "../player/player.h" #include "logic/table_zone_logic.h" #include "pb/command_move_card.pb.h" diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index e155d2ec3..1eb99f5c1 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,9 +1,9 @@ #include "view_zone.h" +#include "../../card/card_info.h" #include "../../server/pending_command.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" -#include "../cards/card_info.h" #include "../player/player.h" #include "logic/view_zone_logic.h" #include "pb/command_dump_zone.pb.h" diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index f280e8794..2cb22ba5c 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -1,7 +1,7 @@ #ifndef ZONEVIEWERZONE_H #define ZONEVIEWERZONE_H -#include "../filters/filter_string.h" +#include "../../filters/filter_string.h" #include "logic/view_zone_logic.h" #include "select_zone.h" diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index dd014d8d9..aad7175bb 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -1,9 +1,9 @@ #include "view_zone_widget.h" #include "../../client/ui/pixel_map_generator.h" +#include "../../filters/syntax_help.h" #include "../../settings/cache_settings.h" #include "../board/card_item.h" -#include "../filters/syntax_help.h" #include "../game_scene.h" #include "../player/player.h" #include "pb/command_shuffle.pb.h" diff --git a/cockatrice/src/utility/card_info_comparator.h b/cockatrice/src/utility/card_info_comparator.h index 9402ed401..18535c85a 100644 --- a/cockatrice/src/utility/card_info_comparator.h +++ b/cockatrice/src/utility/card_info_comparator.h @@ -1,7 +1,7 @@ #ifndef CARD_INFO_COMPARATOR_H #define CARD_INFO_COMPARATOR_H -#include "../game/cards/card_info.h" +#include "../card/card_info.h" #include #include diff --git a/cockatrice/src/utility/card_set_comparator.h b/cockatrice/src/utility/card_set_comparator.h index bca3084e1..d68376cca 100644 --- a/cockatrice/src/utility/card_set_comparator.h +++ b/cockatrice/src/utility/card_set_comparator.h @@ -1,7 +1,7 @@ #ifndef SET_PRIORITY_COMPARATOR_H #define SET_PRIORITY_COMPARATOR_H -#include "../game/cards/card_info.h" +#include "../card/card_info.h" class SetPriorityComparator { diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h index 5b88c211d..414f02694 100644 --- a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h +++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H -#include "../game/cards/card_database_manager.h" +#include "../database/card_database_manager.h" #include diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index a2ce75a31..20bb5c825 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -5,12 +5,12 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$ set(dbconverter_SOURCES src/main.cpp src/mocks.cpp - ../cockatrice/src/game/cards/card_database.cpp - ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../cockatrice/src/game/cards/card_info.cpp - ../cockatrice/src/game/cards/exact_card.cpp + ../cockatrice/src/card/card_info.cpp + ../cockatrice/src/card/exact_card.cpp + ../cockatrice/src/database/card_database.cpp + ../cockatrice/src/database/parser/card_database_parser.cpp + ../cockatrice/src/database/parser/cockatrice_xml_3.cpp + ../cockatrice/src/database/parser/cockatrice_xml_4.cpp ../cockatrice/src/settings/settings_manager.cpp ${VERSION_STRING_CPP} ) diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h index d0aafbff9..3e384c14a 100644 --- a/dbconverter/src/main.h +++ b/dbconverter/src/main.h @@ -1,8 +1,8 @@ #ifndef MAIN_H #define MAIN_H -#include "../../cockatrice/src/game/cards/card_database.h" -#include "../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h" +#include "../../cockatrice/src/database/card_database.h" +#include "../../cockatrice/src/database/parser/cockatrice_xml_4.h" class CardDatabaseConverter : public CardDatabase { diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h index 23210810a..18a50155b 100644 --- a/dbconverter/src/mocks.h +++ b/dbconverter/src/mocks.h @@ -10,7 +10,7 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/game/cards/card_database.h" +#include "../../cockatrice/src/database/card_database.h" #include "../../cockatrice/src/settings/cache_settings.h" #include "../../cockatrice/src/utility/macros.h" diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 5a76f3274..7af66dbb5 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -17,12 +17,12 @@ set(oracle_SOURCES src/pagetemplates.cpp src/parsehelpers.cpp src/qt-json/json.cpp - ../cockatrice/src/game/cards/card_info.cpp + ../cockatrice/src/card/card_info.cpp ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp - ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp + ../cockatrice/src/database/parser/card_database_parser.cpp + ../cockatrice/src/database/parser/cockatrice_xml_3.cpp + ../cockatrice/src/database/parser/cockatrice_xml_4.cpp ../cockatrice/src/settings/cache_settings.cpp ../cockatrice/src/settings/shortcuts_settings.cpp ../cockatrice/src/settings/card_counter_settings.cpp diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 0fd2beaa7..b53f860f0 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,6 +1,6 @@ #include "oracleimporter.h" -#include "game/cards/card_database_parser/cockatrice_xml_4.h" +#include "database/parser/cockatrice_xml_4.h" #include "parsehelpers.h" #include "qt-json/json.h" diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 4d5d77805..5f40af9ba 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include // many users prefer not to see these sets with non english arts diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 4b82e2fb6..590c2daeb 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -18,12 +18,12 @@ add_executable( carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} - ../../cockatrice/src/game/cards/card_database.cpp - ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../../cockatrice/src/game/cards/card_info.cpp - ../../cockatrice/src/game/cards/exact_card.cpp + ../../cockatrice/src/card/card_info.cpp + ../../cockatrice/src/card/exact_card.cpp + ../../cockatrice/src/database/card_database.cpp + ../../cockatrice/src/database/parser/card_database_parser.cpp + ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp + ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp ../../cockatrice/src/settings/settings_manager.cpp carddatabase_test.cpp mocks.cpp @@ -32,16 +32,16 @@ add_executable( filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} - ../../cockatrice/src/game/cards/card_database.cpp - ../../cockatrice/src/game/cards/card_database_manager.cpp - ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../../cockatrice/src/game/cards/card_info.cpp - ../../cockatrice/src/game/cards/exact_card.cpp - ../../cockatrice/src/game/filters/filter_card.cpp - ../../cockatrice/src/game/filters/filter_string.cpp - ../../cockatrice/src/game/filters/filter_tree.cpp + ../../cockatrice/src/card/card_info.cpp + ../../cockatrice/src/card/exact_card.cpp + ../../cockatrice/src/database/card_database.cpp + ../../cockatrice/src/database/card_database_manager.cpp + ../../cockatrice/src/database/parser/card_database_parser.cpp + ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp + ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp + ../../cockatrice/src/filters/filter_card.cpp + ../../cockatrice/src/filters/filter_string.cpp + ../../cockatrice/src/filters/filter_tree.cpp ../../cockatrice/src/settings/settings_manager.cpp filter_string_test.cpp mocks.cpp diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 534600e84..6485a9ebd 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -1,5 +1,5 @@ -#include "../../cockatrice/src/game/cards/card_database_manager.h" -#include "../../cockatrice/src/game/filters/filter_string.h" +#include "../../cockatrice/src/database/card_database_manager.h" +#include "../../cockatrice/src/filters/filter_string.h" #include "mocks.h" #include "gtest/gtest.h" diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index 23210810a..18a50155b 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,7 +10,7 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/game/cards/card_database.h" +#include "../../cockatrice/src/database/card_database.h" #include "../../cockatrice/src/settings/cache_settings.h" #include "../../cockatrice/src/utility/macros.h"