From e5940763388fa55963332577a54e37ec626b294c Mon Sep 17 00:00:00 2001 From: RickyRister Date: Thu, 5 Mar 2026 09:35:49 -0800 Subject: [PATCH] move CardNameNormalizer to libcockatrice_card --- cockatrice/CMakeLists.txt | 1 - .../src/client/network/parsers/interface_json_deck_parser.h | 4 ++-- cockatrice/src/interface/deck_loader/deck_loader.cpp | 3 +-- .../widgets/dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- .../interface/widgets/dialogs/dlg_load_deck_from_website.cpp | 3 +-- .../interface/widgets/dialogs/dlg_load_deck_from_website.h | 1 + .../display/archidekt_api_response_deck_display_widget.cpp | 4 +--- .../api_response/average_deck/edhrec_deck_api_response.cpp | 4 +--- libcockatrice_card/CMakeLists.txt | 2 ++ .../libcockatrice/card/import}/card_name_normalizer.cpp | 2 +- .../libcockatrice/card/import}/card_name_normalizer.h | 0 11 files changed, 11 insertions(+), 15 deletions(-) rename {cockatrice/src/interface/deck_loader => libcockatrice_card/libcockatrice/card/import}/card_name_normalizer.cpp (97%) rename {cockatrice/src/interface/deck_loader => libcockatrice_card/libcockatrice/card/import}/card_name_normalizer.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index c7d136950..d675b809d 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -19,7 +19,6 @@ set(cockatrice_SOURCES src/client/settings/card_counter_settings.cpp src/client/settings/shortcut_treeview.cpp src/client/settings/shortcuts_settings.cpp - src/interface/deck_loader/card_name_normalizer.cpp src/interface/deck_loader/card_node_function.cpp src/interface/deck_loader/deck_file_format.cpp src/interface/deck_loader/deck_loader.cpp diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h index 4f471f83f..1818aa35c 100644 --- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h +++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h @@ -7,12 +7,12 @@ #ifndef INTERFACE_JSON_DECK_PARSER_H #define INTERFACE_JSON_DECK_PARSER_H -#include "../../../interface/deck_loader/card_name_normalizer.h" #include "../../../interface/deck_loader/card_node_function.h" -#include "../../../interface/deck_loader/deck_loader.h" #include #include +#include +#include class IJsonDeckParser { diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index a697314a2..d71dca24a 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -1,7 +1,5 @@ #include "deck_loader.h" -#include "card_name_normalizer.h" - #include #include #include @@ -19,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp index 01c8b3cf2..9ceb35d78 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp @@ -1,7 +1,6 @@ #include "dlg_load_deck_from_clipboard.h" #include "../../../client/settings/cache_settings.h" -#include "../../deck_loader/card_name_normalizer.h" #include "../../deck_loader/card_node_function.h" #include "../../deck_loader/deck_loader.h" #include "dlg_settings.h" @@ -15,6 +14,7 @@ #include #include #include +#include /** * Creates the main layout and connects the signals that are common to all versions of this window diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp index 493e985c4..ba00873d9 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp @@ -1,7 +1,5 @@ #include "dlg_load_deck_from_website.h" -#include "../../deck_loader/card_name_normalizer.h" - #include #include #include @@ -10,6 +8,7 @@ #include #include #include +#include #include DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h index fe6f0a7e9..1ac98d206 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp index 9f1b594bc..8b17cd49e 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp @@ -1,9 +1,7 @@ #include "archidekt_api_response_deck_display_widget.h" -#include "../../../../../deck_loader/card_name_normalizer.h" #include "../../../../../deck_loader/card_node_function.h" #include "../../../../../deck_loader/deck_loader.h" -#include "../../../../cards/card_info_picture_with_text_overlay_widget.h" #include "../../../../cards/card_size_widget.h" #include "../../../../cards/deck_card_zone_display_widget.h" #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h" @@ -11,7 +9,7 @@ #include "../api_response/deck/archidekt_api_response_deck.h" #include -#include +#include ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent, ArchidektApiResponseDeck _response, diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp index 38992a6e3..1cb070c30 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp @@ -1,12 +1,10 @@ #include "edhrec_deck_api_response.h" -#include "../../../../../../deck_loader/card_name_normalizer.h" -#include "../../../../../../deck_loader/deck_loader.h" - #include #include #include #include +#include void EdhrecDeckApiResponse::fromJson(const QJsonArray &json) { diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index f516cde00..e1f2eeaa1 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -12,6 +12,7 @@ set(HEADERS libcockatrice/card/database/parser/card_database_parser.h libcockatrice/card/database/parser/cockatrice_xml_3.h libcockatrice/card/database/parser/cockatrice_xml_4.h + libcockatrice/card/import/card_name_normalizer.h libcockatrice/card/printing/exact_card.h libcockatrice/card/printing/printing_info.h libcockatrice/card/set/card_set.h @@ -36,6 +37,7 @@ add_library( libcockatrice/card/database/parser/card_database_parser.cpp libcockatrice/card/database/parser/cockatrice_xml_3.cpp libcockatrice/card/database/parser/cockatrice_xml_4.cpp + libcockatrice/card/import/card_name_normalizer.cpp libcockatrice/card/printing/exact_card.cpp libcockatrice/card/printing/printing_info.cpp libcockatrice/card/relation/card_relation.cpp diff --git a/cockatrice/src/interface/deck_loader/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp similarity index 97% rename from cockatrice/src/interface/deck_loader/card_name_normalizer.cpp rename to libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp index 216d15ce4..2349dc3e8 100644 --- a/cockatrice/src/interface/deck_loader/card_name_normalizer.cpp +++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp @@ -1,6 +1,6 @@ #include "card_name_normalizer.h" -#include "libcockatrice/card/database/card_database_manager.h" +#include QString CardNameNormalizer::operator()(const QString &cardNameString) const { diff --git a/cockatrice/src/interface/deck_loader/card_name_normalizer.h b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h similarity index 100% rename from cockatrice/src/interface/deck_loader/card_name_normalizer.h rename to libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h