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

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

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 <QDebug>
 #include <QDir>

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 <QAbstractTableModel>
 #include <QMimeData>

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"

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"

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"

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(

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"

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)};

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"

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"

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"

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"

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"

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"

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"

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"

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

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"
 

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"
 

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 <QLoggingCategory>
 #include <QObject>

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"

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"

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"
 

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"
 

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

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 <QHBoxLayout>
 #include <QWidget>

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 <QHBoxLayout>
 #include <QWidget>

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"

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"

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"
 

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"
 

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"

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

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"

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

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 <QPixmap>
 #include <QWidget>

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"

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

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 <QGridLayout>
 #include <QLabel>

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 <QFrame>
 class QLabel;

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"

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"
 

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"

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"

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"

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"
 

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

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"

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

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"

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"
 

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"

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"

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"
 

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"

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

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 <QHBoxLayout>
 #include <QPushButton>

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"
 

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

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 <QPushButton>
 #include <QSpinBox>

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

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"
 

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

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

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 <QLineEdit>
 #include <QPushButton>

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

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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 <QCryptographicHash>
 #include <QDebug>

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 <QBasicMutex>
 #include <QDate>

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

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 <QIODevice>
 #include <QString>

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 <QCoreApplication>
 #include <QDebug>

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"

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"

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"

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