From 17332fa0d6e05a2841600288e601fd1b74a21950 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 15 Sep 2025 20:55:33 -0700 Subject: [PATCH] fix includes --- cockatrice/src/client/network/sets_model.h | 2 +- .../src/client/network/spoiler_background_updater.cpp | 4 ++-- .../src/client/tabs/abstract_tab_deck_editor.cpp | 4 ++-- ...edhrec_api_response_card_details_display_widget.cpp | 2 +- ...c_api_response_commander_details_display_widget.cpp | 2 +- .../src/client/tabs/api/edhrec/tab_edhrec_main.cpp | 6 +++--- .../src/client/tabs/api/edhrec/tab_edhrec_main.h | 2 +- cockatrice/src/client/tabs/tab_deck_editor.cpp | 4 ++-- cockatrice/src/client/tabs/tab_game.cpp | 4 ++-- .../tabs/visual_deck_editor/tab_deck_editor_visual.cpp | 2 +- .../visual_deck_storage/tab_deck_storage_visual.cpp | 2 +- cockatrice/src/client/tapped_out_interface.h | 2 +- .../client/ui/picture_loader/picture_loader_local.cpp | 2 +- .../client/ui/picture_loader/picture_loader_worker.cpp | 2 +- .../client/ui/picture_loader/picture_loader_worker.h | 2 +- .../ui/picture_loader/picture_loader_worker_work.cpp | 2 +- .../ui/picture_loader/picture_loader_worker_work.h | 2 +- .../card_group_display_widget.cpp | 2 +- .../flat_card_group_display_widget.cpp | 2 +- .../overlapped_card_group_display_widget.cpp | 2 +- .../ui/widgets/cards/card_info_display_widget.cpp | 2 +- .../client/ui/widgets/cards/card_info_frame_widget.cpp | 2 +- .../ui/widgets/cards/card_info_picture_widget.cpp | 2 +- .../ui/widgets/deck_analytics/mana_base_widget.cpp | 4 ++-- .../ui/widgets/deck_analytics/mana_curve_widget.cpp | 4 ++-- .../ui/widgets/deck_analytics/mana_devotion_widget.cpp | 4 ++-- .../deck_editor_database_display_widget.cpp | 2 +- .../deck_editor/deck_editor_database_display_widget.h | 2 +- .../deck_editor/deck_editor_deck_dock_widget.cpp | 2 +- .../deck_editor/deck_editor_filter_dock_widget.cpp | 2 +- .../src/client/ui/widgets/general/home_widget.cpp | 2 +- .../printing_selector_card_overlay_widget.cpp | 2 +- ...visual_database_display_main_type_filter_widget.cpp | 2 +- .../visual_database_display_set_filter_widget.cpp | 2 +- .../visual_database_display_sub_type_filter_widget.cpp | 2 +- .../visual_database_display_widget.cpp | 4 ++-- .../visual_database_display_widget.h | 4 ++-- .../visual_deck_editor_sample_hand_widget.cpp | 2 +- .../visual_deck_editor/visual_deck_editor_widget.cpp | 10 +++++----- .../visual_deck_editor/visual_deck_editor_widget.h | 6 +++--- .../deck_preview/deck_preview_widget.cpp | 2 +- .../visual_deck_storage/visual_deck_storage_widget.cpp | 2 +- cockatrice/src/client/ui/window_main.cpp | 4 ++-- cockatrice/src/deck/deck_list_model.cpp | 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_manage_sets.cpp | 2 +- cockatrice/src/dialogs/dlg_move_top_cards_until.cpp | 4 ++-- cockatrice/src/dialogs/dlg_select_set_for_cards.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 4 ++-- cockatrice/src/filters/deck_filter_string.cpp | 2 +- cockatrice/src/filters/filter_tree.h | 2 +- cockatrice/src/game/board/abstract_card_item.cpp | 4 ++-- cockatrice/src/game/deckview/deck_view_container.cpp | 4 ++-- cockatrice/src/game/player/menu/card_menu.cpp | 2 +- cockatrice/src/game/player/menu/player_menu.cpp | 2 +- cockatrice/src/game/player/player_actions.cpp | 2 +- cockatrice/src/game/zones/logic/card_zone_logic.cpp | 2 +- .../src/utility/deck_list_sort_filter_proxy_model.h | 2 +- dbconverter/src/main.h | 4 ++-- dbconverter/src/mocks.h | 2 +- oracle/src/oracleimporter.cpp | 2 +- tests/carddatabase/filter_string_test.cpp | 2 +- tests/carddatabase/mocks.h | 2 +- 66 files changed, 93 insertions(+), 93 deletions(-) diff --git a/cockatrice/src/client/network/sets_model.h b/cockatrice/src/client/network/sets_model.h index 2345a87b3..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 "../../card/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 745b5fc31..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 "../../card/card_database.h" -#include "../../card/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 1ff264b57..bf245ab30 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -1,9 +1,9 @@ #include "abstract_tab_deck_editor.h" -#include "../../card/card_database_manager.h" -#include "../../card/card_database_model.h" #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" 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 cbd65e41f..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 "../../../../../../card/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 356c12514..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 "../../../../../../card/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_main.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp index 96c2660bb..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 "../../../../card/card_completer_proxy_model.h" -#include "../../../../card/card_database_manager.h" -#include "../../../../card/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 457f3118f..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 "../../../../card/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 6ad65f0fc..55f6920bd 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp @@ -1,9 +1,9 @@ #include "tab_deck_editor.h" -#include "../../card/card_database_manager.h" -#include "../../card/card_database_model.h" #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 "../../filters/filter_builder.h" diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index 839c98306..6ffb6668d 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -1,8 +1,8 @@ #include "tab_game.h" -#include "../../card/card_database.h" -#include "../../card/card_database_manager.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" 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 e7377fd96..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,6 +1,6 @@ #include "tab_deck_editor_visual.h" -#include "../../../card/card_database_model.h" +#include "../../../database/card_database_model.h" #include "../../../deck/deck_list_model.h" #include "../../../deck/deck_stats_interface.h" #include "../../../filters/filter_builder.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 e688c288b..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 "../../../card/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 d2d58d9db..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 "../card/card_database.h" +#include "../database/card_database.h" #include "deck_list.h" #include 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 cb7d5664f..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 "../../../card/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_worker.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp index a603d9136..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 "../../../card/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 f0b8920bf..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 "../../../card/card_database.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 637c38a09..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 "../../../card/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 54411145b..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 "../../../card/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/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 ef0e79e8b..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,6 +1,6 @@ #include "card_group_display_widget.h" -#include "../../../../../card/card_database_manager.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.h" #include "../../../../../utility/card_info_comparator.h" #include "../../../../../utility/deck_list_sort_filter_proxy_model.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 9105cef3d..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,6 +1,6 @@ #include "flat_card_group_display_widget.h" -#include "../../../../../card/card_database_manager.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.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 1042cd034..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,6 +1,6 @@ #include "overlapped_card_group_display_widget.h" -#include "../../../../../card/card_database_manager.h" +#include "../../../../../database/card_database_manager.h" #include "../../../../../deck/deck_list_model.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 0addbff72..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,6 +1,6 @@ #include "card_info_display_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" #include "../../../../main.h" #include "card_info_picture_widget.h" 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 835612d57..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,6 +1,6 @@ #include "card_info_frame_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" #include "../../../../settings/cache_settings.h" #include "card_info_display_widget.h" 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 25f191940..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,6 +1,6 @@ #include "card_info_picture_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../game/board/card_item.h" #include "../../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.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 8fcf2a63d..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,7 +1,7 @@ #include "mana_base_widget.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.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 2152a5cd8..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,7 +1,7 @@ #include "mana_curve_widget.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" #include "../../../../main.h" #include "../general/display/banner_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 545a6707d..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,7 +1,7 @@ #include "mana_devotion_widget.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.h" #include "../../../../main.h" #include "../general/display/banner_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 aedf43ad0..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,6 +1,6 @@ #include "deck_editor_database_display_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../filters/syntax_help.h" #include "../../../../settings/cache_settings.h" #include "../../../tabs/abstract_tab_deck_editor.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 407c04723..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,7 +1,7 @@ #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H -#include "../../../../card/card_database_model.h" +#include "../../../../database/card_database_model.h" #include "../../../../deck/custom_line_edit.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 b216969c2..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 "../../../../card/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_filter_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index e4866022d..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,6 +1,6 @@ #include "deck_editor_filter_dock_widget.h" -#include "../../../../card/card_database_model.h" +#include "../../../../database/card_database_model.h" #include "../../../../filters/filter_builder.h" #include "../../../../filters/filter_tree_model.h" #include "../../../../settings/cache_settings.h" diff --git a/cockatrice/src/client/ui/widgets/general/home_widget.cpp b/cockatrice/src/client/ui/widgets/general/home_widget.cpp index 8efb24fe9..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 "../../../../card/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/printing_selector_card_overlay_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 8969728b0..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 "../../../../card/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/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 5d883ddfc..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,6 +1,6 @@ #include "visual_database_display_main_type_filter_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../filters/filter_tree.h" #include "../../../../filters/filter_tree_model.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 14c2917eb..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,6 +1,6 @@ #include "visual_database_display_set_filter_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../filters/filter_tree.h" #include "../../../../filters/filter_tree_model.h" #include "../../../../settings/cache_settings.h" 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 6abc46fde..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,6 +1,6 @@ #include "visual_database_display_sub_type_filter_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../filters/filter_tree.h" #include "../../../../filters/filter_tree_model.h" 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 1621b8da7..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,7 +1,7 @@ #include "visual_database_display_widget.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/custom_line_edit.h" #include "../../../../filters/filter_tree_model.h" #include "../../../../filters/syntax_help.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 02312b2bc..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,8 +1,8 @@ #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_model.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 "../../../../filters/filter_tree_model.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 175fa9f3c..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,6 +1,6 @@ #include "visual_deck_editor_sample_hand_widget.h" -#include "../../../../card/card_database_manager.h" +#include "../../../../database/card_database_manager.h" #include "../../../../deck/deck_loader.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 93e6f51f6..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,10 +1,10 @@ #include "visual_deck_editor_widget.h" -#include "../../../../card/card_completer_proxy_model.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_manager.h" -#include "../../../../card/card_database_model.h" -#include "../../../../card/card_search_model.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 "../../../../main.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 d8f7be5cc..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,9 +1,9 @@ #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H -#include "../../../../card/card_completer_proxy_model.h" -#include "../../../../card/card_database.h" -#include "../../../../card/card_database_model.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 "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_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 0772c4e67..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 "../../../../../card/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_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 0b9856a9b..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 "../../../../card/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 bef5a11fc..e6b54a8a6 100644 --- a/cockatrice/src/client/ui/window_main.cpp +++ b/cockatrice/src/client/ui/window_main.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "window_main.h" -#include "../../card/card_database.h" -#include "../../card/card_database_manager.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" diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index 475376c3c..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 "../card/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_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 9d307d42b..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 "../card/card_database.h" -#include "../card/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 6f05cc46f..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 "../card/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 0db340963..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 "../card/card_database_manager.h" -#include "../card/card_database_model.h" #include "../client/ui/widgets/cards/card_info_picture_widget.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 ff6a17269..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 "../card/card_database.h" -#include "../card/card_database_manager.h" -#include "../card/card_database_model.h" #include "../client/get_text_with_max.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_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index 670132ba6..b6ed4c5ad 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -1,8 +1,8 @@ #include "dlg_manage_sets.h" -#include "../card/card_database_manager.h" #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 "../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 f3608ae91..23d8e22db 100644 --- a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp @@ -1,7 +1,7 @@ #include "dlg_move_top_cards_until.h" -#include "../card/card_database.h" -#include "../card/card_database_manager.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" #include "../filters/filter_string.h" #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 14dc3d767..53375f92e 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -1,8 +1,8 @@ #include "dlg_select_set_for_cards.h" -#include "../card/card_database_manager.h" #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 "dlg_select_set_for_cards.h" diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 9396584fe..1c79d1cff 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -1,7 +1,5 @@ #include "dlg_settings.h" -#include "../card/card_database.h" -#include "../card/card_database_manager.h" #include "../client/get_text_with_max.h" #include "../client/network/release_channel.h" #include "../client/network/spoiler_background_updater.h" @@ -10,6 +8,8 @@ #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 "../main.h" #include "../settings/cache_settings.h" diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index 324f5d8cd..42c7e2cbc 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,6 +1,6 @@ #include "deck_filter_string.h" -#include "../card/card_database_manager.h" +#include "../database/card_database_manager.h" #include "filter_string.h" #include "lib/peglib.h" diff --git a/cockatrice/src/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h index f17b342b2..a1c015e20 100644 --- a/cockatrice/src/filters/filter_tree.h +++ b/cockatrice/src/filters/filter_tree.h @@ -1,7 +1,7 @@ #ifndef FILTERTREE_H #define FILTERTREE_H -#include "../card/card_database.h" +#include "../database/card_database.h" #include "filter_card.h" #include diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 306018b08..5fa3a71be 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -1,8 +1,8 @@ #include "abstract_card_item.h" -#include "../../card/card_database.h" -#include "../../card/card_database_manager.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 "../game_scene.h" diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 52e006db4..103ab49d2 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,9 +1,9 @@ #include "deck_view_container.h" -#include "../../card/card_database.h" -#include "../../card/card_database_manager.h" #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" diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 43ca439e9..bf3ab5375 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,7 +1,7 @@ #include "card_menu.h" -#include "../../../card/card_database_manager.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 "../../zones/logic/view_zone_logic.h" diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index de38ffa01..d6abb3168 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,8 +1,8 @@ #include "player_menu.h" -#include "../../../card/card_database_manager.h" #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 "../../zones/hand_zone.h" #include "../card_menu_action_type.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 8591e6782..4f9a79843 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,9 +1,9 @@ #include "player_actions.h" #include "../../../common/pb/context_move_card.pb.h" -#include "../../card/card_database_manager.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" diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index cac79d435..70cb21b8e 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -1,6 +1,6 @@ #include "card_zone_logic.h" -#include "../../../card/card_database_manager.h" +#include "../../../database/card_database_manager.h" #include "../../board/card_item.h" #include "../../player/player.h" #include "../pile_zone.h" 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 0cd74f8b7..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 "../card/card_database_manager.h" +#include "../database/card_database_manager.h" #include diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h index 249c7440f..dc7185187 100644 --- a/dbconverter/src/main.h +++ b/dbconverter/src/main.h @@ -1,8 +1,8 @@ #ifndef MAIN_H #define MAIN_H -#include "../../cockatrice/src/card/card_database.h" -#include "../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.h" +#include "../../cockatrice/src/database/parser/cockatrice_xml_4.h" +#include "../../cockatrice/src/database/card_database.h" class CardDatabaseConverter : public CardDatabase { diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h index 74c52a5ac..18a50155b 100644 --- a/dbconverter/src/mocks.h +++ b/dbconverter/src/mocks.h @@ -10,7 +10,7 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/card/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/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 5b1baebfb..b53f860f0 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,6 +1,6 @@ #include "oracleimporter.h" -#include "card/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/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 3ddc7220d..6485a9ebd 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -1,4 +1,4 @@ -#include "../../cockatrice/src/card/card_database_manager.h" +#include "../../cockatrice/src/database/card_database_manager.h" #include "../../cockatrice/src/filters/filter_string.h" #include "mocks.h" diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index 74c52a5ac..18a50155b 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,7 +10,7 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/card/card_database.h" +#include "../../cockatrice/src/database/card_database.h" #include "../../cockatrice/src/settings/cache_settings.h" #include "../../cockatrice/src/utility/macros.h"