jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix includes

Browse source
This commit is contained in:
RickyRister 2025-09-15 20:55:33 -07:00
parent 3b2ceab03e
commit 17332fa0d6
66 changed files with 93 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/network/sets_model.h
View file

@ -1,7 +1,7 @@
#ifndef SETSMODEL_H #ifndef SETSMODEL_H
#define SETSMODEL_H #define SETSMODEL_H
#include "../../card/card_database.h" #include "../../database/card_database.h"
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QMimeData> #include <QMimeData>

4
cockatrice/src/client/network/spoiler_background_updater.cpp
View file

@ -1,7 +1,7 @@
#include "spoiler_background_updater.h" #include "spoiler_background_updater.h"
#include "../../card/card_database.h" #include "../../database/card_database.h"
#include "../../card/card_database_manager.h" #include "../../database/card_database_manager.h"
#include "../../main.h" #include "../../main.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../ui/window_main.h" #include "../ui/window_main.h"

4
cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,9 +1,9 @@
#include "abstract_tab_deck_editor.h" #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/tapped_out_interface.h"
#include "../../client/ui/widgets/cards/card_info_frame_widget.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 "../../deck/deck_stats_interface.h"
#include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck.h"
#include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h"

2
cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "edhrec_api_response_card_details_display_widget.h" #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" #include "../../tab_edhrec_main.h"
EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(

2
cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "edhrec_api_response_commander_details_display_widget.h" #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 "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include "../../tab_edhrec_main.h" #include "../../tab_edhrec_main.h"
#include "../card_prices/edhrec_api_response_card_prices_display_widget.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"

6
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp
View file

@ -1,8 +1,8 @@
#include "tab_edhrec_main.h" #include "tab_edhrec_main.h"
#include "../../../../card/card_completer_proxy_model.h" #include "../../../../database/card_completer_proxy_model.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../card/card_search_model.h" #include "../../../../database/card_search_model.h"
#include "../../tab_supervisor.h" #include "../../tab_supervisor.h"
#include "api_response/average_deck/edhrec_average_deck_api_response.h" #include "api_response/average_deck/edhrec_average_deck_api_response.h"
#include "api_response/commander/edhrec_commander_api_response.h" #include "api_response/commander/edhrec_commander_api_response.h"

2
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h
View file

@ -1,7 +1,7 @@
#ifndef TAB_EDHREC_MAIN_H #ifndef TAB_EDHREC_MAIN_H
#define 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/cards/card_size_widget.h"
#include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h"
#include "../../../ui/widgets/quick_settings/settings_button_widget.h" #include "../../../ui/widgets/quick_settings/settings_button_widget.h"

4
cockatrice/src/client/tabs/tab_deck_editor.cpp
View file

@ -1,9 +1,9 @@
#include "tab_deck_editor.h" #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/tapped_out_interface.h"
#include "../../client/ui/widgets/cards/card_info_frame_widget.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.h"
#include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h"
#include "../../filters/filter_builder.h" #include "../../filters/filter_builder.h"

4
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -1,8 +1,8 @@
#include "tab_game.h" #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 "../../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 "../../dialogs/dlg_create_game.h"
#include "../../game/board/arrow_item.h" #include "../../game/board/arrow_item.h"
#include "../../game/board/card_item.h" #include "../../game/board/card_item.h"

2
cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -1,6 +1,6 @@
#include "tab_deck_editor_visual.h" #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_list_model.h"
#include "../../../deck/deck_stats_interface.h" #include "../../../deck/deck_stats_interface.h"
#include "../../../filters/filter_builder.h" #include "../../../filters/filter_builder.h"

2
cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
View file

@ -1,6 +1,6 @@
#include "tab_deck_storage_visual.h" #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/cards/deck_preview_card_picture_widget.h"
#include "../../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h"
#include "../tab_supervisor.h" #include "../tab_supervisor.h"

2
cockatrice/src/client/tapped_out_interface.h
View file

@ -1,7 +1,7 @@
#ifndef TAPPEDOUT_INTERFACE_H #ifndef TAPPEDOUT_INTERFACE_H
#define TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H
#include "../card/card_database.h" #include "../database/card_database.h"
#include "deck_list.h" #include "deck_list.h"
#include <QLoggingCategory> #include <QLoggingCategory>

2
cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
View file

@ -1,6 +1,6 @@
#include "picture_loader_local.h" #include "picture_loader_local.h"
#include "../../../card/card_database_manager.h" #include "../../../database/card_database_manager.h"
#include "../../../settings/cache_settings.h" #include "../../../settings/cache_settings.h"
#include "picture_to_load.h" #include "picture_to_load.h"

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
View file

@ -1,6 +1,6 @@
#include "picture_loader_worker.h" #include "picture_loader_worker.h"
#include "../../../card/card_database_manager.h" #include "../../../database/card_database_manager.h"
#include "../../../settings/cache_settings.h" #include "../../../settings/cache_settings.h"
#include "picture_loader_local.h" #include "picture_loader_local.h"
#include "picture_loader_worker_work.h" #include "picture_loader_worker_work.h"

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
View file

@ -1,8 +1,8 @@
#ifndef PICTURE_LOADER_WORKER_H #ifndef PICTURE_LOADER_WORKER_H
#define PICTURE_LOADER_WORKER_H #define PICTURE_LOADER_WORKER_H
#include "../../../card/card_database.h"
#include "../../../card/card_info.h" #include "../../../card/card_info.h"
#include "../../../database/card_database.h"
#include "picture_loader_local.h" #include "picture_loader_local.h"
#include "picture_loader_worker_work.h" #include "picture_loader_worker_work.h"
#include "picture_to_load.h" #include "picture_to_load.h"

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
View file

@ -1,6 +1,6 @@
#include "picture_loader_worker_work.h" #include "picture_loader_worker_work.h"
#include "../../../card/card_database_manager.h" #include "../../../database/card_database_manager.h"
#include "../../../settings/cache_settings.h" #include "../../../settings/cache_settings.h"
#include "picture_loader_worker.h" #include "picture_loader_worker.h"

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
View file

@ -1,7 +1,7 @@
#ifndef PICTURE_LOADER_WORKER_WORK_H #ifndef PICTURE_LOADER_WORKER_WORK_H
#define 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_loader_worker.h"
#include "picture_to_load.h" #include "picture_to_load.h"

2
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_group_display_widget.h" #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 "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h" #include "../../../../../utility/card_info_comparator.h"
#include "../../../../../utility/deck_list_sort_filter_proxy_model.h" #include "../../../../../utility/deck_list_sort_filter_proxy_model.h"

2
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "flat_card_group_display_widget.h" #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 "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h" #include "../../../../../utility/card_info_comparator.h"
#include "../card_info_picture_with_text_overlay_widget.h" #include "../card_info_picture_with_text_overlay_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "overlapped_card_group_display_widget.h" #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 "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h" #include "../../../../../utility/card_info_comparator.h"
#include "../card_info_picture_with_text_overlay_widget.h" #include "../card_info_picture_with_text_overlay_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_display_widget.h" #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 "../../../../game/board/card_item.h"
#include "../../../../main.h" #include "../../../../main.h"
#include "card_info_picture_widget.h" #include "card_info_picture_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_frame_widget.h" #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 "../../../../game/board/card_item.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "card_info_display_widget.h" #include "card_info_display_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_picture_widget.h" #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 "../../../../game/board/card_item.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../../../tabs/tab_supervisor.h" #include "../../../tabs/tab_supervisor.h"

4
cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -1,7 +1,7 @@
#include "mana_base_widget.h" #include "mana_base_widget.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_loader.h" #include "../../../../deck/deck_loader.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include "../general/display/bar_widget.h" #include "../general/display/bar_widget.h"

4
cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp
View file

@ -1,7 +1,7 @@
#include "mana_curve_widget.h" #include "mana_curve_widget.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_loader.h" #include "../../../../deck/deck_loader.h"
#include "../../../../main.h" #include "../../../../main.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"

4
cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp
View file

@ -1,7 +1,7 @@
#include "mana_devotion_widget.h" #include "mana_devotion_widget.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_loader.h" #include "../../../../deck/deck_loader.h"
#include "../../../../main.h" #include "../../../../main.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "deck_editor_database_display_widget.h" #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 "../../../../filters/syntax_help.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -1,7 +1,7 @@
#ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#define 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 "../../../../deck/custom_line_edit.h"
#include "../../../../utility/key_signals.h" #include "../../../../utility/key_signals.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -1,6 +1,6 @@
#include "deck_editor_deck_dock_widget.h" #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 "../../../../settings/cache_settings.h"
#include <QComboBox> #include <QComboBox>

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
View file

@ -1,6 +1,6 @@
#include "deck_editor_filter_dock_widget.h" #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_builder.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"

2
cockatrice/src/client/ui/widgets/general/home_widget.cpp
View file

@ -1,6 +1,6 @@
#include "home_widget.h" #include "home_widget.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../server/remote/remote_client.h" #include "../../../../server/remote/remote_client.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../../../tabs/tab_supervisor.h" #include "../../../tabs/tab_supervisor.h"

2
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
View file

@ -1,6 +1,6 @@
#include "printing_selector_card_overlay_widget.h" #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 "../../../../settings/cache_settings.h"
#include "printing_selector_card_display_widget.h" #include "printing_selector_card_display_widget.h"

2
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_database_display_main_type_filter_widget.h" #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.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"

2
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_database_display_set_filter_widget.h" #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.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"

2
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_database_display_sub_type_filter_widget.h" #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.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"

4
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "visual_database_display_widget.h" #include "visual_database_display_widget.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../deck/custom_line_edit.h" #include "../../../../deck/custom_line_edit.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"
#include "../../../../filters/syntax_help.h" #include "../../../../filters/syntax_help.h"

4
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
View file

@ -1,8 +1,8 @@
#ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
#define VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_model.h" #include "../../../../database/card_database_model.h"
#include "../../../../deck/custom_line_edit.h" #include "../../../../deck/custom_line_edit.h"
#include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_list_model.h"
#include "../../../../filters/filter_tree_model.h" #include "../../../../filters/filter_tree_model.h"

2
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_deck_editor_sample_hand_widget.h" #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 "../../../../deck/deck_loader.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../cards/card_info_picture_widget.h" #include "../cards/card_info_picture_widget.h"

10
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -1,10 +1,10 @@
#include "visual_deck_editor_widget.h" #include "visual_deck_editor_widget.h"
#include "../../../../card/card_completer_proxy_model.h" #include "../../../../database/card_completer_proxy_model.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../card/card_database_model.h" #include "../../../../database/card_database_model.h"
#include "../../../../card/card_search_model.h" #include "../../../../database/card_search_model.h"
#include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_list_model.h"
#include "../../../../deck/deck_loader.h" #include "../../../../deck/deck_loader.h"
#include "../../../../main.h" #include "../../../../main.h"

6
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -1,9 +1,9 @@
#ifndef VISUAL_DECK_EDITOR_H #ifndef VISUAL_DECK_EDITOR_H
#define VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H
#include "../../../../card/card_completer_proxy_model.h" #include "../../../../database/card_completer_proxy_model.h"
#include "../../../../card/card_database.h" #include "../../../../database/card_database.h"
#include "../../../../card/card_database_model.h" #include "../../../../database/card_database_model.h"
#include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_list_model.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"

2
cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
View file

@ -1,6 +1,6 @@
#include "deck_preview_widget.h" #include "deck_preview_widget.h"
#include "../../../../../card/card_database_manager.h" #include "../../../../../database/card_database_manager.h"
#include "../../../../../settings/cache_settings.h" #include "../../../../../settings/cache_settings.h"
#include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/additional_info/color_identity_widget.h"
#include "../../cards/deck_preview_card_picture_widget.h" #include "../../cards/deck_preview_card_picture_widget.h"

2
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_deck_storage_widget.h" #include "visual_deck_storage_widget.h"
#include "../../../../card/card_database_manager.h" #include "../../../../database/card_database_manager.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../quick_settings/settings_button_widget.h" #include "../quick_settings/settings_button_widget.h"
#include "deck_preview/deck_preview_widget.h" #include "deck_preview/deck_preview_widget.h"

4
cockatrice/src/client/ui/window_main.cpp
View file

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "window_main.h" #include "window_main.h"
#include "../../card/card_database.h" #include "../../database/card_database.h"
#include "../../card/card_database_manager.h" #include "../../database/card_database_manager.h"
#include "../../dialogs/dlg_connect.h" #include "../../dialogs/dlg_connect.h"
#include "../../dialogs/dlg_edit_tokens.h" #include "../../dialogs/dlg_edit_tokens.h"
#include "../../dialogs/dlg_forgot_password_challenge.h" #include "../../dialogs/dlg_forgot_password_challenge.h"

2
cockatrice/src/deck/deck_list_model.cpp
View file

@ -1,6 +1,6 @@
#include "deck_list_model.h" #include "deck_list_model.h"
#include "../card/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../main.h" #include "../main.h"
#include "../settings/cache_settings.h" #include "../settings/cache_settings.h"
#include "deck_loader.h" #include "deck_loader.h"

4
cockatrice/src/deck/deck_loader.cpp
View file

@ -1,7 +1,7 @@
#include "deck_loader.h" #include "deck_loader.h"
#include "../card/card_database.h" #include "../database/card_database.h"
#include "../card/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../main.h" #include "../main.h"
#include "deck_list.h" #include "deck_list.h"
#include "deck_list_card_node.h" #include "deck_list_card_node.h"

2
cockatrice/src/deck/deck_stats_interface.h
View file

@ -1,7 +1,7 @@
#ifndef DECKSTATS_INTERFACE_H #ifndef DECKSTATS_INTERFACE_H
#define DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H
#include "../card/card_database.h" #include "../database/card_database.h"
#include "deck_list.h" #include "deck_list.h"
#include <QObject> #include <QObject>

4
cockatrice/src/dialogs/dlg_create_token.cpp
View file

@ -1,8 +1,8 @@
#include "dlg_create_token.h" #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 "../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 "../main.h"
#include "../settings/cache_settings.h" #include "../settings/cache_settings.h"
#include "deck_list.h" #include "deck_list.h"

6
cockatrice/src/dialogs/dlg_edit_tokens.cpp
View file

@ -1,9 +1,9 @@
#include "dlg_edit_tokens.h" #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 "../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 "../main.h"
#include "trice_limits.h" #include "trice_limits.h"

2
cockatrice/src/dialogs/dlg_manage_sets.cpp
View file

@ -1,8 +1,8 @@
#include "dlg_manage_sets.h" #include "dlg_manage_sets.h"
#include "../card/card_database_manager.h"
#include "../client/network/sets_model.h" #include "../client/network/sets_model.h"
#include "../client/ui/picture_loader/picture_loader.h" #include "../client/ui/picture_loader/picture_loader.h"
#include "../database/card_database_manager.h"
#include "../deck/custom_line_edit.h" #include "../deck/custom_line_edit.h"
#include "../main.h" #include "../main.h"
#include "../settings/cache_settings.h" #include "../settings/cache_settings.h"

4
cockatrice/src/dialogs/dlg_move_top_cards_until.cpp
View file

@ -1,7 +1,7 @@
#include "dlg_move_top_cards_until.h" #include "dlg_move_top_cards_until.h"
#include "../card/card_database.h" #include "../database/card_database.h"
#include "../card/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../filters/filter_string.h" #include "../filters/filter_string.h"
#include <QDialogButtonBox> #include <QDialogButtonBox>

2
cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
View file

@ -1,8 +1,8 @@
#include "dlg_select_set_for_cards.h" #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/cards/card_info_picture_widget.h"
#include "../client/ui/widgets/general/layout_containers/flow_widget.h" #include "../client/ui/widgets/general/layout_containers/flow_widget.h"
#include "../database/card_database_manager.h"
#include "../deck/deck_loader.h" #include "../deck/deck_loader.h"
#include "dlg_select_set_for_cards.h" #include "dlg_select_set_for_cards.h"

4
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -1,7 +1,5 @@
#include "dlg_settings.h" #include "dlg_settings.h"
#include "../card/card_database.h"
#include "../card/card_database_manager.h"
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../client/network/release_channel.h" #include "../client/network/release_channel.h"
#include "../client/network/spoiler_background_updater.h" #include "../client/network/spoiler_background_updater.h"
@ -10,6 +8,8 @@
#include "../client/ui/picture_loader/picture_loader.h" #include "../client/ui/picture_loader/picture_loader.h"
#include "../client/ui/theme_manager.h" #include "../client/ui/theme_manager.h"
#include "../client/ui/widgets/general/background_sources.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 "../deck/custom_line_edit.h"
#include "../main.h" #include "../main.h"
#include "../settings/cache_settings.h" #include "../settings/cache_settings.h"

2
cockatrice/src/filters/deck_filter_string.cpp
View file

@ -1,6 +1,6 @@
#include "deck_filter_string.h" #include "deck_filter_string.h"
#include "../card/card_database_manager.h" #include "../database/card_database_manager.h"
#include "filter_string.h" #include "filter_string.h"
#include "lib/peglib.h" #include "lib/peglib.h"

2
cockatrice/src/filters/filter_tree.h
View file

@ -1,7 +1,7 @@
#ifndef FILTERTREE_H #ifndef FILTERTREE_H
#define FILTERTREE_H #define FILTERTREE_H
#include "../card/card_database.h" #include "../database/card_database.h"
#include "filter_card.h" #include "filter_card.h"
#include <QList> #include <QList>

4
cockatrice/src/game/board/abstract_card_item.cpp
View file

@ -1,8 +1,8 @@
#include "abstract_card_item.h" #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 "../../client/ui/picture_loader/picture_loader.h"
#include "../../database/card_database.h"
#include "../../database/card_database_manager.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../game_scene.h" #include "../game_scene.h"

4
cockatrice/src/game/deckview/deck_view_container.cpp
View file

@ -1,9 +1,9 @@
#include "deck_view_container.h" #include "deck_view_container.h"
#include "../../card/card_database.h"
#include "../../card/card_database_manager.h"
#include "../../client/tabs/tab_game.h" #include "../../client/tabs/tab_game.h"
#include "../../client/ui/picture_loader/picture_loader.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 "../../deck/deck_loader.h"
#include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck.h"
#include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h"

2
cockatrice/src/game/player/menu/card_menu.cpp
View file

@ -1,7 +1,7 @@
#include "card_menu.h" #include "card_menu.h"
#include "../../../card/card_database_manager.h"
#include "../../../client/tabs/tab_game.h" #include "../../../client/tabs/tab_game.h"
#include "../../../database/card_database_manager.h"
#include "../../../settings/card_counter_settings.h" #include "../../../settings/card_counter_settings.h"
#include "../../board/card_item.h" #include "../../board/card_item.h"
#include "../../zones/logic/view_zone_logic.h" #include "../../zones/logic/view_zone_logic.h"

2
cockatrice/src/game/player/menu/player_menu.cpp
View file

@ -1,8 +1,8 @@
#include "player_menu.h" #include "player_menu.h"
#include "../../../card/card_database_manager.h"
#include "../../../client/tabs/tab_game.h" #include "../../../client/tabs/tab_game.h"
#include "../../../common/pb/command_reveal_cards.pb.h" #include "../../../common/pb/command_reveal_cards.pb.h"
#include "../../../database/card_database_manager.h"
#include "../../board/card_item.h" #include "../../board/card_item.h"
#include "../../zones/hand_zone.h" #include "../../zones/hand_zone.h"
#include "../card_menu_action_type.h" #include "../card_menu_action_type.h"

2
cockatrice/src/game/player/player_actions.cpp
View file

@ -1,9 +1,9 @@
#include "player_actions.h" #include "player_actions.h"
#include "../../../common/pb/context_move_card.pb.h" #include "../../../common/pb/context_move_card.pb.h"
#include "../../card/card_database_manager.h"
#include "../../client/get_text_with_max.h" #include "../../client/get_text_with_max.h"
#include "../../client/tabs/tab_game.h" #include "../../client/tabs/tab_game.h"
#include "../../database/card_database_manager.h"
#include "../../dialogs/dlg_move_top_cards_until.h" #include "../../dialogs/dlg_move_top_cards_until.h"
#include "../../dialogs/dlg_roll_dice.h" #include "../../dialogs/dlg_roll_dice.h"
#include "../board/card_item.h" #include "../board/card_item.h"

2
cockatrice/src/game/zones/logic/card_zone_logic.cpp
View file

@ -1,6 +1,6 @@
#include "card_zone_logic.h" #include "card_zone_logic.h"
#include "../../../card/card_database_manager.h" #include "../../../database/card_database_manager.h"
#include "../../board/card_item.h" #include "../../board/card_item.h"
#include "../../player/player.h" #include "../../player/player.h"
#include "../pile_zone.h" #include "../pile_zone.h"

2
cockatrice/src/utility/deck_list_sort_filter_proxy_model.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
#define 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 <QSortFilterProxyModel> #include <QSortFilterProxyModel>

4
dbconverter/src/main.h
View file

@ -1,8 +1,8 @@
#ifndef MAIN_H #ifndef MAIN_H
#define MAIN_H #define MAIN_H
#include "../../cockatrice/src/card/card_database.h" #include "../../cockatrice/src/database/parser/cockatrice_xml_4.h"
#include "../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.h" #include "../../cockatrice/src/database/card_database.h"
class CardDatabaseConverter : public CardDatabase class CardDatabaseConverter : public CardDatabase
{ {

2
dbconverter/src/mocks.h
View file

@ -10,7 +10,7 @@
#define PICTURELOADER_H #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/settings/cache_settings.h"
#include "../../cockatrice/src/utility/macros.h" #include "../../cockatrice/src/utility/macros.h"

2
oracle/src/oracleimporter.cpp
View file

@ -1,6 +1,6 @@
#include "oracleimporter.h" #include "oracleimporter.h"
#include "card/card_database_parser/cockatrice_xml_4.h" #include "database/parser/cockatrice_xml_4.h"
#include "parsehelpers.h" #include "parsehelpers.h"
#include "qt-json/json.h" #include "qt-json/json.h"

2
tests/carddatabase/filter_string_test.cpp
View file

@ -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 "../../cockatrice/src/filters/filter_string.h"
#include "mocks.h" #include "mocks.h"

2
tests/carddatabase/mocks.h
View file

@ -10,7 +10,7 @@
#define PICTURELOADER_H #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/settings/cache_settings.h"
#include "../../cockatrice/src/utility/macros.h" #include "../../cockatrice/src/utility/macros.h"