move CardNameNormalizer to libcockatrice_card

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

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 <QJsonArray>
 #include <QJsonObject>
+#include <libcockatrice/card/import/card_name_normalizer.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class IJsonDeckParser
 {

cockatrice/src/interface/deck_loader/deck_loader.cpp

@@ -1,7 +1,5 @@
 #include "deck_loader.h"
 
-#include "card_name_normalizer.h"
-
 #include <QApplication>
 #include <QClipboard>
 #include <QDebug>
@@ -19,6 +17,7 @@
 #include <QtConcurrentRun>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 

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 <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
+#include <libcockatrice/card/import/card_name_normalizer.h>
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window

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 <QApplication>
 #include <QClipboard>
 #include <QDialogButtonBox>
@@ -10,6 +8,7 @@
 #include <QJsonObject>
 #include <QMessageBox>
 #include <QNetworkReply>
+#include <libcockatrice/card/import/card_name_normalizer.h>
 #include <version_string.h>
 
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h

@@ -14,6 +14,7 @@
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QLoggingCategory>
 #include <QNetworkAccessManager>
 #include <QVBoxLayout>
 

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 <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/import/card_name_normalizer.h>
 
 ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent,
                                                                              ArchidektApiResponseDeck _response,

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 <QApplication>
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <libcockatrice/card/import/card_name_normalizer.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {

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

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 <QRegularExpression>
 
 QString CardNameNormalizer::operator()(const QString &cardNameString) const
 {