[Oracle] Qt version guard for regexp

.github/workflows/desktop-build.yml

@@ -166,7 +166,7 @@ jobs:
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
@@ -205,7 +205,7 @@ jobs:
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
         with:
           path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}

.github/workflows/translations-pull.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/translations/*.ts

.github/workflows/translations-push.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts

README.md

@@ -46,8 +46,7 @@ Latest <kbd>beta</kbd> version:
 
 - [Magic-Token](https://github.com/Cockatrice/Magic-Token): MtG token data to use in Cockatrice
 - [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Script to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) to use in Cockatrice
-- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
-- [Cockatrice @Flathub](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration for our Linux `flatpak` package
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official webpage of the Cockatrice project
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
@@ -55,7 +54,6 @@ Latest <kbd>beta</kbd> version:
 Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other projet contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
 - [Official Website](https://cockatrice.github.io)
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
-- [Official Code Documentation](https://cockatrice.github.io/docs)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
@@ -77,15 +75,10 @@ This tag is used for issues that we are looking for somebody to pick up. Often t
 For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
 We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
 
-You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
-
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
-#### Repository Activity
-![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
-
 <details>
-<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
+<summary><b>Kudos to our amazing contributors ❤️</b></summary>
 <br>
    <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
       <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />

cockatrice/CMakeLists.txt

@@ -19,10 +19,7 @@ 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_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -202,7 +199,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/utility/sequence_edit.cpp
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@@ -230,7 +226,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
     src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp

cockatrice/resources/config/qtlogging.ini

@@ -1,10 +1,6 @@
 [Rules]
 # The default log level is info
 *.debug = false
-#*.info = true
-#*.warning = true
-#*.critical = true
-#*.fatal = true
 
 # Uncomment a rule to see debug level logs for that category,
 # or set <category> = false to disable logging

cockatrice/resources/help/deck_search.md

@@ -15,18 +15,15 @@ searches are case insensitive.
 <dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
 <dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
 
-<dt><u>F</u>ile <u>N</u>ame:</dt>
-<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
-<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
-<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+<dt><u>F</u>ile Name:</dt>
+<dd>[f:aggro](#f:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[f:red f:deck f:wins](#f:red f:deck f:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[f:"red deck wins"](#f:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
 
 <dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
 <dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
 <dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
 
-<dt><u>F</u>ormat:</dt>
-<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
-
 <dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
 <dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
 <dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>

cockatrice/resources/usericons/pawn_donator_double.svg

@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"

cockatrice/resources/usericons/pawn_judge_double.svg

@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"

cockatrice/resources/usericons/pawn_vip_double.svg

@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"

cockatrice/src/client/network/interfaces/deck_stats_interface.cpp

@@ -8,7 +8,6 @@
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -63,7 +62,6 @@ void DeckStatsInterface::analyzeDeck(DeckList *deck)
 
     QNetworkRequest request(QUrl("https://deckstats.net/index.php"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -8,7 +8,6 @@
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -88,7 +87,6 @@ void TappedOutInterface::analyzeDeck(DeckList *deck)
 
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }

cockatrice/src/client/network/parsers/interface_json_deck_parser.h

@@ -6,8 +6,6 @@
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-
-#include "../../../interface/deck_loader/card_node_function.h"
 #include "../../../interface/deck_loader/deck_loader.h"
 
 #include <QJsonArray>
@@ -50,7 +48,7 @@ public:
         }
 
         loader->getDeckList()->loadFromStream_Plain(outStream, false);
-        loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
         return loader;
     }
@@ -97,7 +95,7 @@ public:
         }
 
         loader->getDeckList()->loadFromStream_Plain(outStream, false);
-        loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -14,7 +14,6 @@
 #include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
@@ -40,9 +39,7 @@ void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool sav
 void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 {
     auto *nam = new QNetworkAccessManager(this);
-    auto request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = nam->get(request);
+    QNetworkReply *reply = nam->get(QNetworkRequest(url));
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)

cockatrice/src/filters/deck_filter_string.cpp

@@ -13,7 +13,7 @@ QueryPartList <- ComplexQueryPart ( ws ("AND" ws)? ComplexQueryPart)* ws*
 ComplexQueryPart <- SomewhatComplexQueryPart ws "OR" ws ComplexQueryPart / SomewhatComplexQueryPart
 SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 
-QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / FormatQuery / GenericQuery
+QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
 
@@ -22,9 +22,8 @@ CardSearch <- '[[' CardFilterString ']]'
 CardFilterString <- (!']]'.)*
 
 DeckNameQuery <- ([Dd] 'eck')? [Nn] 'ame'? [:] String
-FileNameQuery <- [Ff] ([Nn] / 'ile' ([Nn] 'ame')?) [:] String
+FileNameQuery <- [Ff] ('ile' 'name'?)? [:] String
 PathQuery <- [Pp] 'ath'? [:] String
-FormatQuery <- [Ff] 'ormat'? [:] String
 
 GenericQuery <- String
 
@@ -119,13 +118,12 @@ static void setupParserRules()
 
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
             int count = 0;
-            auto cardNodes = deck->deckLoader->getDeckList()->getCardNodes();
-            for (auto node : cardNodes) {
+            deck->deckLoader->getDeckList()->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            }
+            });
             return numberMatcher(count);
         };
     };
@@ -158,14 +156,6 @@ static void setupParserRules()
         };
     };
 
-    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto format = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto gameFormat = deck->deckLoader->getDeckList()->getGameFormat();
-            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
-        };
-    };
-
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {

cockatrice/src/game/deckview/deck_view.cpp

@@ -343,7 +343,10 @@ void DeckViewScene::rebuildTree()
     if (!deck)
         return;
 
-    for (auto *currentZone : deck->getZoneNodes()) {
+    InnerDecklistNode *listRoot = deck->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -259,7 +259,7 @@ void DeckViewContainer::loadLocalDeck()
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
     DeckLoader deck(this);
 
     bool success = deck.loadFromFile(filePath, fmt, true);

cockatrice/src/game/player/menu/utility_menu.cpp

@@ -5,7 +5,6 @@
 #include "../player_actions.h"
 #include "player_menu.h"
 
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 
 UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
@@ -66,13 +65,15 @@ void UtilityMenu::populatePredefinedTokensMenu()
         return;
     }
 
-    auto tokenCardNodes = _deck->getDeckList()->getCardNodes({DECK_ZONE_TOKENS});
+    InnerDecklistNode *tokenZone =
+        dynamic_cast<InnerDecklistNode *>(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS));
 
-    if (!tokenCardNodes.isEmpty()) {
-        setEnabled(true);
+    if (tokenZone) {
+        if (!tokenZone->empty())
+            setEnabled(true);
 
-        for (int i = 0; i < tokenCardNodes.size(); ++i) {
-            const QString tokenName = tokenCardNodes[i]->getName();
+        for (int i = 0; i < tokenZone->size(); ++i) {
+            const QString tokenName = tokenZone->at(i)->getName();
             predefinedTokens.append(tokenName);
             QAction *a = addAction(tokenName);
             if (i < 10) {

cockatrice/src/game/player/player.cpp

@@ -263,7 +263,7 @@ void Player::deleteCard(CardItem *card)
     }
 }
 
-//! \todo Does a player need a DeckLoader?
+// TODO: Does a player need a DeckLoader?
 void Player::setDeck(DeckLoader &_deck)
 {
     deck = new DeckLoader(this, _deck.getDeckList());

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp

@@ -10,7 +10,6 @@
 #include <QNetworkReply>
 #include <QThread>
 #include <utility>
-#include <version_string.h>
 
 static constexpr int MAX_REQUESTS_PER_SEC = 10;
 
@@ -87,7 +86,6 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     }
 
     QNetworkRequest req(url);
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     if (!picDownload) {
         req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
     }

cockatrice/src/interface/deck_loader/card_node_function.cpp

@@ -1,40 +0,0 @@
-#include "card_node_function.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-
-void CardNodeFunction::SetProviderIdToPreferred::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
-    QString providerId = preferredPrinting.getUuid();
-    QString setShortName = preferredPrinting.getSet()->getShortName();
-    QString collectorNumber = preferredPrinting.getProperty("num");
-
-    card->setCardProviderId(providerId);
-    card->setCardCollectorNumber(collectorNumber);
-    card->setCardSetShortName(setShortName);
-}
-
-void CardNodeFunction::ClearPrintingData::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    card->setCardSetShortName(nullptr);
-    card->setCardCollectorNumber(nullptr);
-    card->setCardProviderId(nullptr);
-}
-
-void CardNodeFunction::ResolveProviderId::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    // Retrieve the providerId based on setName and collectorNumber
-    QString providerId =
-        CardDatabaseManager::getInstance()
-            ->query()
-            ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
-            .getUuid();
-
-    // Set the providerId on the card
-    card->setCardProviderId(providerId);
-}

cockatrice/src/interface/deck_loader/card_node_function.h

@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_DECK_FUNCTION_H
-#define COCKATRICE_DECK_FUNCTION_H
-
-class DecklistCardNode;
-class InnerDecklistNode;
-
-/**
- * Functions to be used with DeckList::forEachCard
- */
-namespace CardNodeFunction
-{
-
-/**
- * @brief Sets the providerId of the card to the preferred printing.
- */
-struct SetProviderIdToPreferred
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Clears all fields on the card related to the printing
- */
-struct ClearPrintingData
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Sets the providerId of the card based on its set name and collector number.
- */
-struct ResolveProviderId
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-} // namespace CardNodeFunction
-
-#endif // COCKATRICE_DECK_FUNCTION_H

cockatrice/src/interface/deck_loader/deck_file_format.cpp

@@ -1,9 +0,0 @@
-#include "deck_file_format.h"
-
-DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
-{
-    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
-        return Cockatrice;
-    }
-    return PlainText;
-}

cockatrice/src/interface/deck_loader/deck_file_format.h

@@ -1,36 +0,0 @@
-#ifndef COCKATRICE_DECK_FILE_FORMAT_H
-#define COCKATRICE_DECK_FILE_FORMAT_H
-#include <QString>
-
-namespace DeckFileFormat
-{
-
-/**
- * The deck file formats that Cockatrice supports.
- */
-enum Format
-{
-    /**
-     * Plaintext deck files, a format that is intended to be widely supported among different programs.
-     * This format does not support Cockatrice specific features such as banner cards or tags.
-     */
-    PlainText,
-
-    /**
-     * This is cockatrice's native deck file format, and supports deck metadata such as banner cards and tags.
-     * Stored as .cod files.
-     */
-    Cockatrice
-};
-
-/**
- * Determines what deck file format the given filename corresponds to.
- *
- * @param fileName The filename
- * @return The deck format
- */
-Format getFormatFromName(const QString &fileName);
-
-} // namespace DeckFileFormat
-
-#endif // COCKATRICE_DECK_FILE_FORMAT_H

cockatrice/src/interface/deck_loader/deck_loader.cpp

@@ -33,7 +33,7 @@ DeckLoader::DeckLoader(QObject *parent, DeckList *_deckList) : QObject(parent),
 {
 }
 
-bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
+bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -42,17 +42,17 @@ bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fm
 
     bool result = false;
     switch (fmt) {
-        case DeckFileFormat::PlainText:
+        case PlainTextFormat:
             result = deckList->loadFromFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice: {
+        case CockatriceFormat: {
             result = deckList->loadFromFile_Native(&file);
             qCInfo(DeckLoaderLog) << "Loaded from" << fileName << "-" << result;
             if (!result) {
                 qCInfo(DeckLoaderLog) << "Retrying as plain format";
                 file.seek(0);
                 result = deckList->loadFromFile_Plain(&file);
-                fmt = DeckFileFormat::PlainText;
+                fmt = PlainTextFormat;
             }
             break;
         }
@@ -77,7 +77,7 @@ bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fm
     return result;
 }
 
-bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
+bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest)
 {
     auto *watcher = new QFutureWatcher<bool>(this);
 
@@ -106,9 +106,9 @@ bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Form
         }
 
         switch (fmt) {
-            case DeckFileFormat::PlainText:
+            case PlainTextFormat:
                 return deckList->loadFromFile_Plain(&file);
-            case DeckFileFormat::Cockatrice: {
+            case CockatriceFormat: {
                 bool result = false;
                 result = deckList->loadFromFile_Native(&file);
                 if (!result) {
@@ -140,7 +140,7 @@ bool DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
     return result;
 }
 
-bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
+bool DeckLoader::saveToFile(const QString &fileName, FileFormat fmt)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -149,10 +149,10 @@ bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
 
     bool result = false;
     switch (fmt) {
-        case DeckFileFormat::PlainText:
+        case PlainTextFormat:
             result = deckList->saveToFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice:
+        case CockatriceFormat:
             result = deckList->saveToFile_Native(&file);
             qCInfo(DeckLoaderLog) << "Saving to " << fileName << "-" << result;
             break;
@@ -172,7 +172,7 @@ bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
     return result;
 }
 
-bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, DeckFileFormat::Format fmt)
+bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt)
 {
     QFileInfo fileInfo(fileName);
     if (!fileInfo.exists()) {
@@ -193,10 +193,10 @@ bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, DeckFileForm
 
     // Perform file modifications
     switch (fmt) {
-        case DeckFileFormat::PlainText:
+        case PlainTextFormat:
             result = deckList->saveToFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice:
+        case CockatriceFormat:
             deckList->setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
             result = deckList->saveToFile_Native(&file);
             break;
@@ -269,20 +269,6 @@ static QString toDecklistExportString(const DecklistCardNode *card)
     return cardString;
 }
 
-/**
- * Converts all cards in the list to their decklist export string and joins them into one string
- */
-static QString toDecklistExportString(const QList<const DecklistCardNode *> &cardNodes)
-{
-    QString result;
-
-    for (auto cardNode : cardNodes) {
-        result += toDecklistExportString(cardNode);
-    }
-
-    return result;
-}
-
 /**
  * Export deck to decklist function, called to format the deck in a way to be sent to a server
  *
@@ -293,11 +279,29 @@ QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsi
 {
     // Add the base url
     QString deckString = "https://" + getDomainForWebsite(website) + "/?";
+    // Create two strings to pass to function
+    QString mainBoardCards, sideBoardCards;
 
-    // export all cards in zone
-    QString mainBoardCards = toDecklistExportString(deckList->getCardNodes({DECK_ZONE_MAIN}));
-    QString sideBoardCards = toDecklistExportString(deckList->getCardNodes({DECK_ZONE_SIDE}));
+    // Set up the function to call
+    auto formatDeckListForExport = [&mainBoardCards, &sideBoardCards](const auto *node, const auto *card) {
+        // Get the card name
+        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken()) {
+            // If it's a token, we don't care about the card.
+            return;
+        }
 
+        // Check if it's a sideboard card.
+        if (node->getName() == DECK_ZONE_SIDE) {
+            sideBoardCards += toDecklistExportString(card);
+        } else {
+            // If it's a mainboard card, do the same thing, but for the mainboard card string
+            mainBoardCards += toDecklistExportString(card);
+        }
+    };
+
+    // call our struct function for each card in the deck
+    deckList->forEachCard(formatDeckListForExport);
     // Remove the extra return at the end of the last cards
     mainBoardCards.chop(3);
     sideBoardCards.chop(3);
@@ -312,6 +316,112 @@ QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsi
     return deckString;
 }
 
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId to the preferred printing.
+struct SetProviderIdToPreferred
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    SetProviderIdToPreferred()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
+        QString providerId = preferredPrinting.getUuid();
+        QString setShortName = preferredPrinting.getSet()->getShortName();
+        QString collectorNumber = preferredPrinting.getProperty("num");
+
+        card->setCardProviderId(providerId);
+        card->setCardCollectorNumber(collectorNumber);
+        card->setCardSetShortName(setShortName);
+    }
+};
+
+/**
+ * This function iterates through each card in the decklist and sets the providerId
+ * on each card based on its set name and collector number.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::setProviderIdToPreferredPrinting(const DeckList *deckList)
+{
+    // Set up the struct to call.
+    SetProviderIdToPreferred setProviderIdToPreferred;
+
+    // Call the forEachCard method for each card in the deck
+    deckList->forEachCard(setProviderIdToPreferred);
+}
+
+/**
+ * Sets the providerId on each card in the decklist based on its set name and collector number.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::resolveSetNameAndNumberToProviderID(const DeckList *deckList)
+{
+    auto setProviderId = [](const auto node, const auto card) {
+        Q_UNUSED(node);
+        // Retrieve the providerId based on setName and collectorNumber
+        QString providerId =
+            CardDatabaseManager::getInstance()
+                ->query()
+                ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
+                .getUuid();
+
+        // Set the providerId on the card
+        card->setCardProviderId(providerId);
+    };
+
+    deckList->forEachCard(setProviderId);
+}
+
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId.
+struct ClearSetNameNumberAndProviderId
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    ClearSetNameNumberAndProviderId()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    }
+};
+
+/**
+ * Clears the set name and numbers on each card in the decklist.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::clearSetNamesAndNumbers(const DeckList *deckList)
+{
+    auto clearSetNameAndNumber = [](const auto node, auto card) {
+        Q_UNUSED(node)
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    };
+
+    deckList->forEachCard(clearSetNameAndNumber);
+}
+
+DeckLoader::FileFormat DeckLoader::getFormatFromName(const QString &fileName)
+{
+    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
+        return CockatriceFormat;
+    }
+    return PlainTextFormat;
+}
+
 void DeckLoader::saveToClipboard(const DeckList *deckList, bool addComments, bool addSetNameAndNumber)
 {
     QString buffer;
@@ -331,7 +441,9 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
     }
 
     // loop zones
-    for (auto zoneNode : deckList->getZoneNodes()) {
+    for (int i = 0; i < deckList->getRoot()->size(); i++) {
+        const auto *zoneNode = dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i));
+
         saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
 
         // end of zone
@@ -452,12 +564,12 @@ bool DeckLoader::convertToCockatriceFormat(QString fileName)
     bool result = false;
 
     // Perform file modifications based on the detected format
-    switch (DeckFileFormat::getFormatFromName(fileName)) {
-        case DeckFileFormat::PlainText:
+    switch (getFormatFromName(fileName)) {
+        case PlainTextFormat:
             // Save in Cockatrice's native format
             result = deckList->saveToFile_Native(&file);
             break;
-        case DeckFileFormat::Cockatrice:
+        case CockatriceFormat:
             qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed.";
             result = true;
             break;
@@ -478,14 +590,37 @@ bool DeckLoader::convertToCockatriceFormat(QString fileName)
         }
         lastLoadInfo = {
             .fileName = newFileName,
-            .fileFormat = DeckFileFormat::Cockatrice,
+            .fileFormat = CockatriceFormat,
         };
     }
 
     return result;
 }
 
-void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
+QString DeckLoader::getCardZoneFromName(const QString &cardName, QString currentZoneName)
+{
+    CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(cardName);
+
+    if (card && card->getIsToken()) {
+        return DECK_ZONE_TOKENS;
+    }
+
+    return currentZoneName;
+}
+
+QString DeckLoader::getCompleteCardName(const QString &cardName)
+{
+    if (CardDatabaseManager::getInstance()) {
+        ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
+        if (temp) {
+            return temp.getName();
+        }
+    }
+
+    return cardName;
+}
+
+void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
 {
     const int totalColumns = 2;
 
@@ -568,11 +703,12 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList *deckList)
     cursor.insertText(deckList->getComments());
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-    for (auto zoneNode : deckList->getZoneNodes()) {
+    for (int i = 0; i < deckList->getRoot()->size(); i++) {
         cursor.insertHtml("<br><img src=theme:hr.jpg>");
+        // cursor.insertHtml("<hr>");
         cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-        printDeckListNode(&cursor, zoneNode);
+        printDeckListNode(&cursor, dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i)));
     }
 
     doc.print(printer);

cockatrice/src/interface/deck_loader/deck_loader.h

@@ -7,16 +7,14 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "loaded_deck.h"
-
 #include <QLoggingCategory>
 #include <QPrinter>
 #include <QTextCursor>
 #include <libcockatrice/deck_list/deck_list.h>
 
-inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
+inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
 
-class DeckLoader : public QObject
+    class DeckLoader : public QObject
 {
     Q_OBJECT
 signals:
@@ -24,6 +22,27 @@ signals:
     void loadFinished(bool success);
 
 public:
+    enum FileFormat
+    {
+        PlainTextFormat,
+        CockatriceFormat
+    };
+
+    /**
+     * @brief Information about where the deck was loaded from.
+     *
+     * For local decks, the remoteDeckId field will always be -1.
+     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
+     */
+    struct LoadInfo
+    {
+        static constexpr int NON_REMOTE_ID = -1;
+
+        QString fileName = "";
+        FileFormat fileFormat = CockatriceFormat;
+        int remoteDeckId = NON_REMOTE_ID;
+    };
+
     /**
      * Supported file extensions for decklist files
      */
@@ -42,7 +61,7 @@ public:
 
 private:
     DeckList *deckList;
-    LoadedDeck::LoadInfo lastLoadInfo;
+    LoadInfo lastLoadInfo;
 
 public:
     DeckLoader(QObject *parent);
@@ -50,29 +69,35 @@ public:
     DeckLoader(const DeckLoader &) = delete;
     DeckLoader &operator=(const DeckLoader &) = delete;
 
-    const LoadedDeck::LoadInfo &getLastLoadInfo() const
+    const LoadInfo &getLastLoadInfo() const
     {
         return lastLoadInfo;
     }
 
-    void setLastLoadInfo(const LoadedDeck::LoadInfo &info)
+    void setLastLoadInfo(const LoadInfo &info)
     {
         lastLoadInfo = info;
     }
 
     [[nodiscard]] bool hasNotBeenLoaded() const
     {
-        return lastLoadInfo.isEmpty();
+        return lastLoadInfo.fileName.isEmpty() && lastLoadInfo.remoteDeckId == LoadInfo::NON_REMOTE_ID;
     }
 
-    bool loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest = false);
-    bool loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest);
+    static void clearSetNamesAndNumbers(const DeckList *deckList);
+    static FileFormat getFormatFromName(const QString &fileName);
+
+    bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false);
+    bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest);
     bool loadFromRemote(const QString &nativeString, int remoteDeckId);
-    bool saveToFile(const QString &fileName, DeckFileFormat::Format fmt);
-    bool updateLastLoadedTimestamp(const QString &fileName, DeckFileFormat::Format fmt);
+    bool saveToFile(const QString &fileName, FileFormat fmt);
+    bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);
 
     static QString exportDeckToDecklist(const DeckList *deckList, DecklistWebsite website);
 
+    static void setProviderIdToPreferredPrinting(const DeckList *deckList);
+    static void resolveSetNameAndNumberToProviderID(const DeckList *deckList);
+
     static void saveToClipboard(const DeckList *deckList, bool addComments = true, bool addSetNameAndNumber = true);
     static bool saveToStream_Plain(QTextStream &out,
                                    const DeckList *deckList,
@@ -94,7 +119,7 @@ public:
     }
 
 private:
-    static void printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node);
+    static void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
     static void saveToStream_DeckHeader(QTextStream &out, const DeckList *deckList);
 
     static void saveToStream_DeckZone(QTextStream &out,
@@ -106,6 +131,9 @@ private:
                                            QList<DecklistCardNode *> cards,
                                            bool addComments = true,
                                            bool addSetNameAndNumber = true);
+
+    [[nodiscard]] static QString getCardZoneFromName(const QString &cardName, QString currentZoneName);
+    [[nodiscard]] static QString getCompleteCardName(const QString &cardName);
 };
 
 #endif

cockatrice/src/interface/deck_loader/loaded_deck.cpp

@@ -1,11 +0,0 @@
-#include "loaded_deck.h"
-
-bool LoadedDeck::LoadInfo::isEmpty() const
-{
-    return fileName.isEmpty() && remoteDeckId == NON_REMOTE_ID;
-}
-
-bool LoadedDeck::isEmpty() const
-{
-    return deckList.isEmpty() && lastLoadInfo.isEmpty();
-}

cockatrice/src/interface/deck_loader/loaded_deck.h

@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_LOADED_DECK_H
-#define COCKATRICE_LOADED_DECK_H
-
-#include "deck_file_format.h"
-#include "libcockatrice/deck_list/deck_list.h"
-
-#include <QString>
-
-/**
- * @brief Represents a deck that was loaded from somewhere.
- * Contains the DeckList itself, as well as info about where it was loaded from.
- */
-struct LoadedDeck
-{
-
-    /**
-     * @brief Information about where the deck was loaded from.
-     *
-     * For local decks, the remoteDeckId field will always be -1.
-     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
-     */
-    struct LoadInfo
-    {
-        static constexpr int NON_REMOTE_ID = -1;
-
-        QString fileName = "";
-        DeckFileFormat::Format fileFormat = DeckFileFormat::Cockatrice;
-        int remoteDeckId = NON_REMOTE_ID;
-
-        bool isEmpty() const;
-    };
-
-    DeckList deckList;     ///< The decklist itself
-    LoadInfo lastLoadInfo; ///< info about where the deck was loaded from
-
-    bool isEmpty() const;
-};
-
-#endif // COCKATRICE_LOADED_DECK_H

cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp

@@ -39,6 +39,10 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT
         setMouseTracking(true);
     }
 
+    enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(this->window());
+    enlargedPixmapWidget->hide();
+    connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
+
     hoverTimer = new QTimer(this);
     hoverTimer->setSingleShot(true);
     connect(hoverTimer, &QTimer::timeout, this, &CardInfoPictureWidget::showEnlargedPixmap);
@@ -273,7 +277,7 @@ void CardInfoPictureWidget::leaveEvent(QEvent *event)
 
     if (hoverToZoomEnabled) {
         hoverTimer->stop();
-        destroyEnlargedPixmapWidget();
+        enlargedPixmapWidget->hide();
     }
 
     if (raiseOnEnter) {
@@ -290,7 +294,7 @@ void CardInfoPictureWidget::moveEvent(QMoveEvent *event)
     QWidget::moveEvent(event);
 
     hoverTimer->stop();
-    destroyEnlargedPixmapWidget();
+    enlargedPixmapWidget->hide();
 
     if (animation->state() == QAbstractAnimation::Running) {
         return;
@@ -306,7 +310,7 @@ void CardInfoPictureWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QWidget::mouseMoveEvent(event);
 
-    if (hoverToZoomEnabled && enlargedPixmapWidget && enlargedPixmapWidget->isVisible()) {
+    if (hoverToZoomEnabled && enlargedPixmapWidget->isVisible()) {
         const QPoint cursorPos = QCursor::pos();
         const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
         const QSize widgetSize = enlargedPixmapWidget->size();
@@ -340,7 +344,7 @@ void CardInfoPictureWidget::mousePressEvent(QMouseEvent *event)
 
 void CardInfoPictureWidget::hideEvent(QHideEvent *event)
 {
-    destroyEnlargedPixmapWidget();
+    enlargedPixmapWidget->hide();
     QWidget::hideEvent(event);
 }
 
@@ -440,19 +444,12 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
  * If card information is available, the enlarged pixmap is loaded, positioned near the cursor,
  * and displayed.
  */
-void CardInfoPictureWidget::showEnlargedPixmap()
+void CardInfoPictureWidget::showEnlargedPixmap() const
 {
     if (!exactCard) {
         return;
     }
 
-    // Lazy creation of the enlarged widget
-    if (!enlargedPixmapWidget) {
-        enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(const_cast<CardInfoPictureWidget *>(this)->window());
-        enlargedPixmapWidget->hide();
-        connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
-    }
-
     const QSize enlargedSize(static_cast<int>(size().width() * 2), static_cast<int>(size().width() * aspectRatio * 2));
     enlargedPixmapWidget->setCardPixmap(exactCard, enlargedSize);
 
@@ -463,6 +460,7 @@ void CardInfoPictureWidget::showEnlargedPixmap()
     int newX = cursorPos.x() + enlargedPixmapOffset;
     int newY = cursorPos.y() + enlargedPixmapOffset;
 
+    // Adjust if out of bounds
     if (newX + widgetSize.width() > screenGeometry.right()) {
         newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
     }
@@ -474,11 +472,3 @@ void CardInfoPictureWidget::showEnlargedPixmap()
 
     enlargedPixmapWidget->show();
 }
-
-void CardInfoPictureWidget::destroyEnlargedPixmapWidget()
-{
-    if (enlargedPixmapWidget) {
-        enlargedPixmapWidget->deleteLater();
-        enlargedPixmapWidget = nullptr;
-    }
-}

cockatrice/src/interface/widgets/cards/card_info_picture_widget.h

@@ -63,8 +63,7 @@ protected:
     {
         return resizedPixmap;
     }
-    void showEnlargedPixmap();
-    void destroyEnlargedPixmapWidget();
+    void showEnlargedPixmap() const;
 
 private:
     ExactCard exactCard;

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -124,12 +124,6 @@ void DeckEditorDeckDockWidget::createDeckDock()
     quickSettingsWidget->addSettingsWidget(showBannerCardCheckBox);
     quickSettingsWidget->addSettingsWidget(showTagsWidgetCheckBox);
 
-    formatLabel = new QLabel(this);
-
-    formatComboBox = new QComboBox(this);
-    formatComboBox->addItem(tr("Loading Database..."));
-    formatComboBox->setEnabled(false); // Disable until loaded
-
     commentsLabel = new QLabel();
     commentsLabel->setObjectName("commentsLabel");
     commentsEdit = new QTextEdit;
@@ -160,10 +154,8 @@ void DeckEditorDeckDockWidget::createDeckDock()
             &DeckEditorDeckDockWidget::setBannerCard);
     bannerCardComboBox->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
 
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckModel->getDeckList()->getTags());
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckModel->getDeckList());
     deckTagsDisplayWidget->setHidden(!SettingsCache::instance().getDeckEditorTagsWidgetVisible());
-    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, this,
-            &DeckEditorDeckDockWidget::setTags);
 
     activeGroupCriteriaLabel = new QLabel(this);
 
@@ -214,16 +206,13 @@ void DeckEditorDeckDockWidget::createDeckDock()
     upperLayout->addWidget(commentsLabel, 1, 0);
     upperLayout->addWidget(commentsEdit, 1, 1);
 
-    upperLayout->addWidget(formatLabel, 2, 0);
-    upperLayout->addWidget(formatComboBox, 2, 1);
+    upperLayout->addWidget(bannerCardLabel, 2, 0);
+    upperLayout->addWidget(bannerCardComboBox, 2, 1);
 
-    upperLayout->addWidget(bannerCardLabel, 3, 0);
-    upperLayout->addWidget(bannerCardComboBox, 3, 1);
+    upperLayout->addWidget(deckTagsDisplayWidget, 3, 1);
 
-    upperLayout->addWidget(deckTagsDisplayWidget, 4, 1);
-
-    upperLayout->addWidget(activeGroupCriteriaLabel, 5, 0);
-    upperLayout->addWidget(activeGroupCriteriaComboBox, 5, 1);
+    upperLayout->addWidget(activeGroupCriteriaLabel, 4, 0);
+    upperLayout->addWidget(activeGroupCriteriaComboBox, 4, 1);
 
     hashLabel1 = new QLabel();
     hashLabel1->setObjectName("hashLabel1");
@@ -272,46 +261,6 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     refreshShortcuts();
     retranslateUi();
-
-    connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
-            &DeckEditorDeckDockWidget::initializeFormats);
-
-    if (CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok) {
-        initializeFormats();
-    }
-}
-
-void DeckEditorDeckDockWidget::initializeFormats()
-{
-    QMap<QString, int> allFormats = CardDatabaseManager::query()->getAllFormatsWithCount();
-
-    formatComboBox->clear(); // Remove "Loading Database..."
-    formatComboBox->setEnabled(true);
-
-    // Populate with formats
-    formatComboBox->addItem("", "");
-    for (auto it = allFormats.constBegin(); it != allFormats.constEnd(); ++it) {
-        QString displayText = QString("%1").arg(it.key());
-        formatComboBox->addItem(displayText, it.key()); // store the raw key in itemData
-    }
-
-    if (!deckModel->getDeckList()->getGameFormat().isEmpty()) {
-        deckModel->setActiveFormat(deckModel->getDeckList()->getGameFormat());
-        formatComboBox->setCurrentIndex(formatComboBox->findData(deckModel->getDeckList()->getGameFormat()));
-    } else {
-        // Ensure no selection is visible initially
-        formatComboBox->setCurrentIndex(-1);
-    }
-
-    connect(formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
-        if (index >= 0) {
-            QString formatKey = formatComboBox->itemData(index).toString();
-            deckModel->setActiveFormat(formatKey);
-        } else {
-            deckModel->setActiveFormat(QString()); // clear format if deselected
-        }
-        emit deckModified();
-    });
 }
 
 ExactCard DeckEditorDeckDockWidget::getCurrentCard()
@@ -386,7 +335,7 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
 
     // Collect unique (name, providerId) pairs
     QSet<QPair<QString, QString>> bannerCardSet;
-    QList<const DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         if (!CardDatabaseManager::query()->getCard(currentCard->toCardRef())) {
@@ -434,13 +383,6 @@ void DeckEditorDeckDockWidget::setBannerCard(int /* changedIndex */)
     emit deckModified();
 }
 
-void DeckEditorDeckDockWidget::setTags(const QStringList &tags)
-{
-    deckModel->getDeckList()->setTags(tags);
-    deckEditor->setModified(true);
-    emit deckModified();
-}
-
 void DeckEditorDeckDockWidget::syncDeckListBannerCardWithComboBox()
 {
     auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
@@ -509,18 +451,12 @@ void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel()
     sortDeckModelToDeckView();
     expandAll();
 
-    deckTagsDisplayWidget->setTags(deckModel->getDeckList()->getTags());
+    deckTagsDisplayWidget->setDeckList(deckModel->getDeckList());
 }
 
 void DeckEditorDeckDockWidget::sortDeckModelToDeckView()
 {
     deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
-    deckModel->setActiveFormat(deckModel->getDeckList()->getGameFormat());
-    formatComboBox->setCurrentIndex(formatComboBox->findData(deckModel->getDeckList()->getGameFormat()));
-    deckView->expandAll();
-    deckView->expandAll();
-
-    emit deckChanged();
 }
 
 DeckLoader *DeckEditorDeckDockWidget::getDeckLoader()
@@ -548,7 +484,7 @@ void DeckEditorDeckDockWidget::cleanDeck()
     emit deckModified();
     emit deckChanged();
     updateBannerCardComboBox();
-    deckTagsDisplayWidget->setTags(deckModel->getDeckList()->getTags());
+    deckTagsDisplayWidget->setDeckList(deckModel->getDeckList());
 }
 
 void DeckEditorDeckDockWidget::recursiveExpand(const QModelIndex &index)
@@ -779,8 +715,6 @@ void DeckEditorDeckDockWidget::retranslateUi()
     showTagsWidgetCheckBox->setText(tr("Show tags selection menu"));
     commentsLabel->setText(tr("&Comments:"));
     activeGroupCriteriaLabel->setText(tr("Group by:"));
-    formatLabel->setText(tr("Format:"));
-
     hashLabel1->setText(tr("Hash:"));
 
     aIncrement->setText(tr("&Increment number"));

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -69,7 +69,6 @@ public slots:
     void actSwapCard();
     void actRemoveCard();
     void offsetCountAtIndex(const QModelIndex &idx, int offset);
-    void initializeFormats();
     void expandAll();
 
 signals:
@@ -101,8 +100,6 @@ private:
     LineEditUnfocusable *hashLabel;
     QLabel *activeGroupCriteriaLabel;
     QComboBox *activeGroupCriteriaComboBox;
-    QLabel *formatLabel;
-    QComboBox *formatComboBox;
 
     QAction *aRemoveCard, *aIncrement, *aDecrement, *aSwapCard;
 
@@ -115,7 +112,6 @@ private slots:
     void updateName(const QString &name);
     void updateComments();
     void setBannerCard(int);
-    void setTags(const QStringList &tags);
     void syncDeckListBannerCardWithComboBox();
     void updateHash();
     void refreshShortcuts();

cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp

@@ -23,7 +23,8 @@ QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
 
     if (role == Qt::BackgroundRole) {
         if (isCard) {
-            const bool legal = QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
+            const bool legal =
+                true; // TODO: Not implemented yet. QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
             int base = 255 - (index.row() % 2) * 30;
             return legal ? QBrush(QColor(base, base, base)) : QBrush(QColor(255, base / 3, base / 3));
         } else {

cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp

@@ -109,7 +109,7 @@ void DlgCreateGame::sharedCtor()
     gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1);
     gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0);
-    if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
+    if (room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
         gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 2, 0);
     } else {
         createGameAsJudgeCheckBox->setChecked(false);

cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp

@@ -59,7 +59,7 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 
 void DlgEditPassword::actOk()
 {
-    //! \todo this stuff should be using qvalidators
+    // TODO this stuff should be using qvalidators
     if (newPasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;

cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp

@@ -121,7 +121,7 @@ void DlgForgotPasswordReset::actOk()
         return;
     }
 
-    //! \todo this stuff should be using qvalidators
+    // TODO this stuff should be using qvalidators
     if (newpasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;

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_node_function.h"
 #include "../../deck_loader/deck_loader.h"
 #include "dlg_settings.h"
 
@@ -83,9 +82,9 @@ bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckLoader *deckLoader) const
 
     if (deckLoader->getDeckList()->loadFromStream_Plain(stream, true)) {
         if (loadSetNameAndNumberCheckBox->isChecked()) {
-            deckLoader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
+            DeckLoader::resolveSetNameAndNumberToProviderID(deckLoader->getDeckList());
         } else {
-            deckLoader->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
+            DeckLoader::clearSetNamesAndNumbers(deckLoader->getDeckList());
         }
         return true;
     }

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

@@ -8,7 +8,6 @@
 #include <QJsonObject>
 #include <QMessageBox>
 #include <QNetworkReply>
-#include <version_string.h>
 
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)
 {
@@ -68,7 +67,6 @@ void DlgLoadDeckFromWebsite::accept()
         }
 
         QNetworkRequest request(QUrl(info.fullUrl));
-        request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
         QNetworkReply *reply = nam->get(request);
 
         QEventLoop loop;
@@ -100,7 +98,7 @@ void DlgLoadDeckFromWebsite::accept()
             DeckLoader *loader = new DeckLoader(this);
             QTextStream stream(&deckText);
             loader->getDeckList()->loadFromStream_Plain(stream, false);
-            loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
+            DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
             deck = loader;
 
             QDialog::accept();

cockatrice/src/interface/widgets/dialogs/dlg_register.cpp

@@ -356,7 +356,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 
 void DlgRegister::actOk()
 {
-    //! \todo this stuff should be using qvalidators
+    // TODO this stuff should be using qvalidators
     if (passwordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Registration Warning"), tr("Your password is too short."));
         return;

cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp

@@ -1,6 +1,5 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../../deck_loader/card_node_function.h"
 #include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
@@ -178,7 +177,7 @@ void DlgSelectSetForCards::actOK()
 void DlgSelectSetForCards::actClear()
 {
     emit deckAboutToBeModified(tr("Cleared all printing information."));
-    model->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
+    DeckLoader::clearSetNamesAndNumbers(model->getDeckList());
     emit deckModified();
     accept();
 }
@@ -186,8 +185,8 @@ void DlgSelectSetForCards::actClear()
 void DlgSelectSetForCards::actSetAllToPreferred()
 {
     emit deckAboutToBeModified(tr("Set all printings to preferred."));
-    model->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
-    model->getDeckList()->forEachCard(CardNodeFunction::SetProviderIdToPreferred());
+    DeckLoader::clearSetNamesAndNumbers(model->getDeckList());
+    DeckLoader::setProviderIdToPreferredPrinting(model->getDeckList());
     emit deckModified();
     accept();
 }
@@ -228,7 +227,7 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
     if (!decklist)
         return setCounts;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
@@ -271,7 +270,7 @@ void DlgSelectSetForCards::updateCardLists()
     if (!decklist)
         return;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         bool found = false;
@@ -360,7 +359,7 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
     if (!decklist)
         return setCards;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());

cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp

@@ -1913,7 +1913,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) {
-        //! \todo Prompt to create it
+        // TODO: Prompt to create it
         if (QMessageBox::critical(
                 this, tr("Error"),
                 tr("The path to your deck directory is invalid. Would you like to go back and set the correct path?"),
@@ -1924,7 +1924,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) {
-        //! \todo Prompt to create it
+        // TODO: Prompt to create it
         if (QMessageBox::critical(this, tr("Error"),
                                   tr("The path to your card pictures directory is invalid. Would you like to go back "
                                      "and set the correct path?"),

cockatrice/src/interface/widgets/general/home_widget.cpp

@@ -23,7 +23,7 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     backgroundSourceDeck = new DeckLoader(this);
 
     backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
-                                       DeckFileFormat::Cockatrice, false);
+                                       DeckLoader::CockatriceFormat, false);
 
     gradientColors = extractDominantColors(background);
 
@@ -73,7 +73,7 @@ void HomeWidget::initializeBackgroundFromSource()
             break;
         case BackgroundSources::DeckFileArt:
             backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
-                                               DeckFileFormat::Cockatrice, false);
+                                               DeckLoader::CockatriceFormat, false);
             cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
             break;
     }

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp

@@ -311,7 +311,7 @@ int CardAmountWidget::countCardsInZone(const QString &deckZone)
         return -1;
     }
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
 
     int count = 0;
     for (auto currentCard : cardsInDeck) {

cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp

@@ -206,7 +206,7 @@ void ChatView::appendMessage(QString message,
     defaultFormat = QTextCharFormat();
     if (!isUserMessage) {
         if (messageType == Event_RoomSay::ChatHistory) {
-            defaultFormat.setForeground(Qt::gray); //! \todo hardcoded color
+            defaultFormat.setForeground(Qt::gray); // FIXME : hardcoded color
             defaultFormat.setFontWeight(QFont::Light);
             defaultFormat.setFontItalic(true);
             static const QRegularExpression userNameRegex("^(\\[[^\\]]*\\]\\s)(\\S+):\\s");
@@ -229,7 +229,7 @@ void ChatView::appendMessage(QString message,
                 message.remove(0, pos.relativePosition - 2); // do not remove semicolon
             }
         } else {
-            defaultFormat.setForeground(Qt::darkGreen); //! \todo hardcoded color
+            defaultFormat.setForeground(Qt::darkGreen); // FIXME : hardcoded color
             defaultFormat.setFontWeight(QFont::Bold);
         }
     }

cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp

@@ -380,7 +380,7 @@ void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
  */
 void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation)
 {
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
 
     auto *l = new DeckLoader(this);
     if (l->loadFromFile(fileName, fmt, true)) {
@@ -406,7 +406,7 @@ void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLo
 bool AbstractTabDeckEditor::actSaveDeck()
 {
     DeckLoader *const deck = getDeckLoader();
-    if (deck->getLastLoadInfo().remoteDeckId != LoadedDeck::LoadInfo::NON_REMOTE_ID) {
+    if (deck->getLastLoadInfo().remoteDeckId != DeckLoader::LoadInfo::NON_REMOTE_ID) {
         QString deckString = deck->getDeckList()->writeToString_Native();
         if (deckString.length() > MAX_FILE_LENGTH) {
             QMessageBox::critical(this, tr("Error"), tr("Could not save remote deck"));
@@ -452,7 +452,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
         return false;
 
     QString fileName = dialog.selectedFiles().at(0);
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
 
     if (!getDeckLoader()->saveToFile(fileName, fmt)) {
         QMessageBox::critical(

cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h

@@ -1,227 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_FORMATS_H
-#define COCKATRICE_ARCHIDEKT_FORMATS_H
-#include <QHash>
-#include <QString>
-
-namespace ArchidektFormats
-{
-enum class DeckFormat
-{
-    Standard = 0,
-    Modern = 1,
-    Commander = 2,
-    Legacy = 3,
-    Vintage = 4,
-    Pauper = 5,
-    Custom = 6,
-    Frontier = 7,
-    FutureStandard = 8,
-    PennyDreadful = 9,
-    Commander1v1 = 10,
-    DualCommander = 11,
-    Brawl = 12,
-
-    // Values outside Archidekt range
-    Alchemy = 1000,
-    Historic = 1001,
-    Gladiator = 1002,
-    Oathbreaker = 1003,
-    OldSchool = 1004,
-    PauperCommander = 1005,
-    Pioneer = 1006,
-    PreDH = 1007,
-    Premodern = 1008,
-    StandardBrawl = 1009,
-    Timeless = 1010,
-    Unknown = 1011
-};
-
-inline static QString formatToApiName(DeckFormat format)
-{
-    switch (format) {
-        case DeckFormat::Standard:
-            return "Standard";
-        case DeckFormat::Modern:
-            return "Modern";
-        case DeckFormat::Commander:
-            return "Commander";
-        case DeckFormat::Legacy:
-            return "Legacy";
-        case DeckFormat::Vintage:
-            return "Vintage";
-        case DeckFormat::Pauper:
-            return "Pauper";
-        case DeckFormat::Custom:
-            return "Custom";
-        case DeckFormat::Frontier:
-            return "Frontier";
-        case DeckFormat::FutureStandard:
-            return "Future Std";
-        case DeckFormat::PennyDreadful:
-            return "Penny Dreadful";
-        case DeckFormat::Commander1v1:
-            return "1v1 Commander";
-        case DeckFormat::DualCommander:
-            return "Dual Commander";
-        case DeckFormat::Brawl:
-            return "Brawl";
-
-        case DeckFormat::Alchemy:
-            return "Alchemy";
-        case DeckFormat::Historic:
-            return "Historic";
-        case DeckFormat::Gladiator:
-            return "Gladiator";
-        case DeckFormat::Oathbreaker:
-            return "Oathbreaker";
-        case DeckFormat::OldSchool:
-            return "Old School";
-        case DeckFormat::PauperCommander:
-            return "Pauper Commander";
-        case DeckFormat::Pioneer:
-            return "Pioneer";
-        case DeckFormat::PreDH:
-            return "PreDH";
-        case DeckFormat::Premodern:
-            return "Premodern";
-        case DeckFormat::StandardBrawl:
-            return "Standard Brawl";
-        case DeckFormat::Timeless:
-            return "Timeless";
-
-        default:
-            return "Unknown";
-    }
-}
-
-inline static DeckFormat apiNameToFormat(const QString &name)
-{
-    const QString n = name.trimmed();
-
-    if (n.compare("Standard", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Standard;
-    if (n.compare("Modern", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Modern;
-    if (n.compare("Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Commander;
-    if (n.compare("Legacy", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Legacy;
-    if (n.compare("Vintage", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Vintage;
-    if (n.compare("Pauper", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Pauper;
-    if (n.compare("Custom", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Custom;
-    if (n.compare("Frontier", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Frontier;
-    if (n.compare("Future Std", Qt::CaseInsensitive) == 0)
-        return DeckFormat::FutureStandard;
-    if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PennyDreadful;
-    if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Commander1v1;
-    if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::DualCommander;
-    if (n.compare("Brawl", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Brawl;
-
-    if (n.compare("Alchemy", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Alchemy;
-    if (n.compare("Historic", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Historic;
-    if (n.compare("Gladiator", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Gladiator;
-    if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Oathbreaker;
-    if (n.compare("Old School", Qt::CaseInsensitive) == 0)
-        return DeckFormat::OldSchool;
-    if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PauperCommander;
-    if (n.compare("Pioneer", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Pioneer;
-    if (n.compare("PreDH", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PreDH;
-    if (n.compare("Premodern", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Premodern;
-    if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0)
-        return DeckFormat::StandardBrawl;
-    if (n.compare("Timeless", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Timeless;
-
-    return DeckFormat::Unknown;
-}
-
-inline static QString formatToCockatriceName(DeckFormat format)
-{
-    switch (format) {
-        case DeckFormat::Standard:
-            return "standard";
-        case DeckFormat::Modern:
-            return "modern";
-        case DeckFormat::Commander:
-            return "commander";
-        case DeckFormat::Legacy:
-            return "legacy";
-        case DeckFormat::Vintage:
-            return "vintage";
-        case DeckFormat::Pauper:
-            return "pauper";
-        case DeckFormat::Brawl:
-            return "brawl";
-        case DeckFormat::PennyDreadful:
-            return "penny";
-        case DeckFormat::FutureStandard:
-            return "future";
-        case DeckFormat::Commander1v1:
-            return "duel";
-        case DeckFormat::DualCommander:
-            return "duel";
-        case DeckFormat::Alchemy:
-            return "alchemy";
-        case DeckFormat::Historic:
-            return "historic";
-        case DeckFormat::Gladiator:
-            return "gladiator";
-        case DeckFormat::Oathbreaker:
-            return "oathbreaker";
-        case DeckFormat::OldSchool:
-            return "oldschool";
-        case DeckFormat::PauperCommander:
-            return "paupercommander";
-        case DeckFormat::Pioneer:
-            return "pioneer";
-        case DeckFormat::PreDH:
-            return "predh";
-        case DeckFormat::Premodern:
-            return "premodern";
-        case DeckFormat::StandardBrawl:
-            return "standardbrawl";
-        case DeckFormat::Timeless:
-            return "timeless";
-
-        default:
-            return {};
-    }
-}
-
-inline static DeckFormat cockatriceNameToFormat(const QString &apiName)
-{
-    static const QHash<QString, DeckFormat> map = {
-        {"standard", DeckFormat::Standard},     {"modern", DeckFormat::Modern},
-        {"commander", DeckFormat::Commander},   {"legacy", DeckFormat::Legacy},
-        {"vintage", DeckFormat::Vintage},       {"pauper", DeckFormat::Pauper},
-        {"brawl", DeckFormat::Brawl},           {"penny", DeckFormat::PennyDreadful},
-        {"future", DeckFormat::FutureStandard}, {"duel", DeckFormat::Commander1v1},
-        {"alchemy", DeckFormat::Alchemy},       {"historic", DeckFormat::Historic},
-        {"gladiator", DeckFormat::Gladiator},   {"oathbreaker", DeckFormat::Oathbreaker},
-        {"oldschool", DeckFormat::OldSchool},   {"paupercommander", DeckFormat::PauperCommander},
-        {"pioneer", DeckFormat::Pioneer},       {"predh", DeckFormat::PreDH},
-        {"premodern", DeckFormat::Premodern},   {"standardbrawl", DeckFormat::StandardBrawl},
-        {"timeless", DeckFormat::Timeless}};
-
-    return map.value(apiName.toLower(), DeckFormat::Unknown);
-}
-
-} // namespace ArchidektFormats
-
-#endif // COCKATRICE_ARCHIDEKT_FORMATS_H

cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp

@@ -21,16 +21,16 @@ void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
     edition.fromJson(json.value("edition").toObject());
 
     flavor = json.value("flavor").toString();
-    //! \todo but not really important
-    //! \todo games = {""};
-    //! \todo options = {""};
+    // TODO but not really important
+    // games = {""};
+    // options = {""};
     scryfallImageHash = json.value("scryfallImageHash").toString();
     oracleCard = json.value("oracleCard").toObject();
     owned = json.value("owned").toInt();
     pinnedStatus = json.value("pinnedStatus").toInt();
     rarity = json.value("rarity").toString();
-    //! \todo but not really important
-    //! \todo globalCategories = {""};
+    // TODO but not really important
+    // globalCategories = {""};
 }
 
 void ArchidektApiResponseCard::debugPrint() const

cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h

@@ -39,11 +39,6 @@ public:
         return name;
     };
 
-    int getDeckFormat() const
-    {
-        return deckFormat;
-    }
-
 private:
     int id;
     QString name;

cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp

@@ -1,12 +1,10 @@
 #include "archidekt_api_response_deck_display_widget.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"
-#include "../api_response/archidekt_formats.h"
 #include "../api_response/deck/archidekt_api_response_deck.h"
 
 #include <QSortFilterProxyModel>
@@ -70,7 +68,7 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
     connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset);
     model->getDeckList()->loadFromStream_Plain(deckStream, false);
 
-    model->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
+    DeckLoader::resolveSetNameAndNumberToProviderID(model->getDeckList());
 
     model->rebuildTree();
 
@@ -94,8 +92,6 @@ void ArchidektApiResponseDeckDisplayWidget::actOpenInDeckEditor()
     loader->getDeckList()->loadFromString_Native(model->getDeckList()->writeToString_Native());
 
     loader->getDeckList()->setName(response.getDeckName());
-    loader->getDeckList()->setGameFormat(
-        ArchidektFormats::formatToCockatriceName(ArchidektFormats::DeckFormat(response.getDeckFormat() - 1)));
 
     emit openInDeckEditor(loader);
 }

cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp

@@ -12,11 +12,10 @@
 #include <QNetworkReply>
 #include <QPixmap>
 #include <QWidget>
-#include <version_string.h>
 
 #define ARCHIDEKT_DEFAULT_IMAGE "https://storage.googleapis.com/topdekt-user/images/archidekt_deck_card_shadow.jpg"
 
-static QString timeAgo(const QString &timestamp)
+QString timeAgo(const QString &timestamp)
 {
     QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate);
 
@@ -83,7 +82,6 @@ ArchidektApiResponseDeckEntryDisplayWidget::ArchidektApiResponseDeckEntryDisplay
     imageUrl = response.getFeatured().isEmpty() ? QUrl(ARCHIDEKT_DEFAULT_IMAGE) : QUrl(response.getFeatured());
 
     QNetworkRequest req(imageUrl);
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     QNetworkReply *reply = imageNetworkManager->get(req);
 
     // tag the reply with "this" so we know it belongs to us later

cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp

@@ -22,7 +22,6 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <version_string.h>
 
 TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
@@ -214,7 +213,7 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
     minDeckSizeLogicCombo->addItems({"Exact", "≥", "≤"}); // Exact = unset, ≥ = GTE, ≤ = LTE
     minDeckSizeLogicCombo->setCurrentIndex(1);            // default GTE
 
-    connect(minDeckSizeSpin, qOverload<int>(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
+    connect(minDeckSizeSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
     connect(minDeckSizeLogicCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
 
     // Page number
@@ -224,7 +223,7 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
     pageSpin->setRange(1, 9999);
     pageSpin->setValue(1);
 
-    connect(pageSpin, qOverload<int>(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
+    connect(pageSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
 
     // Page display
     currentPageDisplay = new QWidget(container);
@@ -427,21 +426,18 @@ void TabArchidekt::doSearchImmediate()
 {
     QString url = buildSearchUrl();
     QNetworkRequest req{QUrl(url)};
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(req);
 }
 
 void TabArchidekt::actNavigatePage(QString url)
 {
     QNetworkRequest request{QUrl(url)};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(request);
 }
 
 void TabArchidekt::getTopDecks()
 {
     QNetworkRequest request{QUrl(buildSearchUrl())};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(request);
 }
 

cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp

@@ -25,7 +25,6 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <version_string.h>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {
@@ -167,7 +166,6 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
     }
 
     QNetworkRequest request{QUrl(url)};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -175,7 +173,6 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
 void TabEdhRecMain::actNavigatePage(QString url)
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages" + url + ".json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -183,7 +180,6 @@ void TabEdhRecMain::actNavigatePage(QString url)
 void TabEdhRecMain::getTopCards()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/top/year.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -191,7 +187,6 @@ void TabEdhRecMain::getTopCards()
 void TabEdhRecMain::getTopCommanders()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/commanders/year.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -199,7 +194,7 @@ void TabEdhRecMain::getTopCommanders()
 void TabEdhRecMain::getTopTags()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/tags.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+
     networkManager->get(request);
 }
 

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -242,7 +242,7 @@ void TabDeckStorage::actOpenLocalDeck()
         QString filePath = localDirModel->filePath(curLeft);
 
         auto deckLoader = new DeckLoader(this);
-        if (!deckLoader->loadFromFile(filePath, DeckFileFormat::Cockatrice, true))
+        if (!deckLoader->loadFromFile(filePath, DeckLoader::CockatriceFormat, true))
             continue;
 
         emit openDeckEditor(deckLoader);
@@ -308,7 +308,7 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa
     QFileInfo deckFileInfo(deckFile);
 
     DeckLoader deck(this);
-    if (!deck.loadFromFile(filePath, DeckFileFormat::Cockatrice)) {
+    if (!deck.loadFromFile(filePath, DeckLoader::CockatriceFormat)) {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck file"));
         return;
     }
@@ -493,7 +493,7 @@ void TabDeckStorage::downloadFinished(const Response &r,
     QString filePath = extraData.toString();
 
     DeckLoader deck(this, new DeckList(QString::fromStdString(resp.deck())));
-    deck.saveToFile(filePath, DeckFileFormat::Cockatrice);
+    deck.saveToFile(filePath, DeckLoader::CockatriceFormat);
 }
 
 void TabDeckStorage::actNewFolder()

cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp

@@ -25,7 +25,7 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
 void TabDeckStorageVisual::actOpenLocalDeck(const QString &filePath)
 {
     auto deckLoader = new DeckLoader(this);
-    if (!deckLoader->loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true)) {
+    if (!deckLoader->loadFromFile(filePath, DeckLoader::getFormatFromName(filePath), true)) {
         QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(filePath));
         return;
     }

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp

@@ -18,16 +18,6 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    // Filter search input
-    searchInput = new QLineEdit(this);
-    layout->addWidget(searchInput);
-
-    connect(searchInput, &QLineEdit::textChanged, this, &VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter);
-
-    // File list container
-    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(fileListWidget);
-
     // Input for filter filename
     filenameInput = new QLineEdit(this);
     layout->addWidget(filenameInput);
@@ -35,20 +25,18 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     // Save button
     saveButton = new QPushButton(this);
     layout->addWidget(saveButton);
-    // Disable save if empty
-    saveButton->setEnabled(false);
-    connect(filenameInput, &QLineEdit::textChanged, this,
-            [this](const QString &text) { saveButton->setEnabled(!text.trimmed().isEmpty()); });
-
     connect(saveButton, &QPushButton::clicked, this, &VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter);
 
+    // File list container
+    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    layout->addWidget(fileListWidget);
+
     refreshFilterList(); // Populate the file list on startup
     retranslateUi();
 }
 
 void VisualDatabaseDisplayFilterSaveLoadWidget::retranslateUi()
 {
-    searchInput->setPlaceholderText(tr("Search filter..."));
     saveButton->setText(tr("Save Filter"));
     saveButton->setToolTip(tr("Save all currently applied filters to a file"));
     filenameInput->setPlaceholderText(tr("Enter filename..."));
@@ -124,36 +112,42 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filena
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter(const QString &text)
-{
-    fileListWidget->clearLayout();
-
-    QString filter = text.trimmed();
-    QStringList filtered = allFilterFiles;
-
-    if (!filter.isEmpty()) {
-        filtered = filtered.filter(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption));
-    }
-
-    for (const QString &filename : filtered) {
-        FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
-        fileListWidget->addWidget(filterWidget);
-
-        connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
-                &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
-
-        connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
-                &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
-    }
-}
-
 void VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList()
 {
     fileListWidget->clearLayout();
-    fileButtons.clear();
+    // Clear existing widgets
+    for (auto buttonPair : fileButtons) {
+        buttonPair.first->deleteLater();
+        buttonPair.second->deleteLater();
+    }
+    fileButtons.clear(); // Clear the list of buttons
 
+    // Refresh the filter file list
     QDir dir(SettingsCache::instance().getFiltersPath());
-    allFilterFiles = dir.entryList({"*.json"}, QDir::Files, QDir::Name);
+    QStringList filterFiles = dir.entryList(QStringList() << "*.json", QDir::Files, QDir::Name);
 
-    applySearchFilter(searchInput->text());
+    // Loop through the filter files and create widgets for them
+    for (const QString &filename : filterFiles) {
+        bool alreadyAdded = false;
+
+        // Check if the widget for this filter file already exists to avoid duplicates
+        for (const auto &pair : fileButtons) {
+            if (pair.first->text() == filename) {
+                alreadyAdded = true;
+                break;
+            }
+        }
+
+        if (!alreadyAdded) {
+            // Create a new custom widget for the filter
+            FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
+            fileListWidget->addWidget(filterWidget);
+
+            // Connect signals to handle loading and deletion
+            connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
+                    &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
+            connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
+                    &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
+        }
+    }
 }

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h

@@ -27,7 +27,6 @@ public:
 
     void saveFilter();
     void loadFilter(const QString &filename);
-    void applySearchFilter(const QString &text);
     void refreshFilterList();
     void deleteFilter(const QString &filename, QPushButton *deleteButton);
 
@@ -38,11 +37,9 @@ private:
     FilterTreeModel *filterModel;
 
     QVBoxLayout *layout;
-    QLineEdit *searchInput;
-    FlowWidget *fileListWidget;
     QLineEdit *filenameInput;
     QPushButton *saveButton;
-    QStringList allFilterFiles;
+    FlowWidget *fileListWidget;
 
     QMap<QString, QPair<QPushButton *, QPushButton *>> fileButtons;
 };

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp

@@ -1,205 +0,0 @@
-#include "visual_database_display_format_legality_filter_widget.h"
-
-#include "../../../filters/filter_tree_model.h"
-
-#include <QPushButton>
-#include <QSpinBox>
-#include <QTimer>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_tree.h>
-
-VisualDatabaseDisplayFormatLegalityFilterWidget::VisualDatabaseDisplayFormatLegalityFilterWidget(
-    QWidget *parent,
-    FilterTreeModel *_filterModel)
-    : QWidget(parent), filterModel(_filterModel)
-{
-    allFormatsWithCount = CardDatabaseManager::query()->getAllFormatsWithCount();
-
-    setMaximumHeight(75);
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-
-    layout = new QHBoxLayout(this);
-    setLayout(layout);
-    layout->setContentsMargins(0, 1, 0, 1);
-    layout->setSpacing(1);
-    layout->setAlignment(Qt::AlignTop);
-
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(flowWidget);
-
-    // Create the spinbox
-    spinBox = new QSpinBox(this);
-    spinBox->setMinimum(1);
-    spinBox->setMaximum(getMaxMainTypeCount()); // Set the max value dynamically
-    spinBox->setValue(150);
-    layout->addWidget(spinBox);
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
-            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility);
-
-    // Create the toggle button for Exact Match/Includes mode
-    toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
-    layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::toggled, this,
-            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode);
-    connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
-        QTimer::singleShot(100, this, &VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel);
-    });
-
-    createFormatButtons();   // Populate buttons initially
-    updateFilterMode(false); // Initialize toggle button text
-
-    retranslateUi();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::retranslateUi()
-{
-    spinBox->setToolTip(tr("Do not display formats with less than this amount of cards in the database"));
-    toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::createFormatButtons()
-{
-    // Iterate through main types and create buttons
-    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
-        auto *button = new QPushButton(it.key(), flowWidget);
-        button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
-
-        flowWidget->addWidget(button);
-        formatButtons[it.key()] = button;
-
-        // Connect toggle signal
-        connect(button, &QPushButton::toggled, this,
-                [this, mainType = it.key()](bool checked) { handleFormatToggled(mainType, checked); });
-    }
-    updateFormatButtonsVisibility(); // Ensure visibility is updated initially
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility()
-{
-    int threshold = spinBox->value(); // Get the current spinbox value
-
-    // Iterate through buttons and hide/disable those below the threshold
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        bool visible = allFormatsWithCount[it.key()] >= threshold;
-        it.value()->setVisible(visible);
-        it.value()->setEnabled(visible);
-    }
-}
-
-int VisualDatabaseDisplayFormatLegalityFilterWidget::getMaxMainTypeCount() const
-{
-    int maxCount = 1;
-    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
-        maxCount = qMax(maxCount, it.value());
-    }
-    return maxCount;
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::handleFormatToggled(const QString &format, bool active)
-{
-    activeFormats[format] = active;
-
-    if (formatButtons.contains(format)) {
-        formatButtons[format]->setChecked(active);
-    }
-
-    updateFormatFilter();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatFilter()
-{
-    // Clear existing filters related to main type
-    filterModel->blockSignals(true);
-    filterModel->filterTree()->blockSignals(true);
-    filterModel->clearFiltersOfType(CardFilter::Attr::AttrFormat);
-
-    if (exactMatchMode) {
-        // Exact Match: Only selected main types are allowed
-        QSet<QString> selectedTypes;
-        for (const auto &type : activeFormats.keys()) {
-            if (activeFormats[type]) {
-                selectedTypes.insert(type);
-            }
-        }
-
-        if (!selectedTypes.isEmpty()) {
-            // Require all selected types (TypeAnd)
-            for (const auto &type : selectedTypes) {
-                QString typeString = type;
-                filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
-            }
-
-            // Exclude any other types (TypeAndNot)
-            for (const auto &type : formatButtons.keys()) {
-                if (!selectedTypes.contains(type)) {
-                    QString typeString = type;
-                    filterModel->addFilter(
-                        new CardFilter(typeString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrFormat));
-                }
-            }
-        }
-    } else {
-        // Default Includes Mode (TypeOr) - match any selected main types
-        for (const auto &type : activeFormats.keys()) {
-            if (activeFormats[type]) {
-                QString typeString = type;
-                filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
-            }
-        }
-    }
-
-    filterModel->blockSignals(false);
-    filterModel->filterTree()->blockSignals(false);
-
-    emit filterModel->filterTree()->changed();
-    emit filterModel->layoutChanged();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode(bool checked)
-{
-    exactMatchMode = checked;
-    toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
-    updateFormatFilter();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel()
-{
-    // Temporarily block signals for each button to prevent toggling while updating button states
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->blockSignals(true);
-    }
-
-    // Uncheck all buttons
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->setChecked(false);
-    }
-
-    // Get active filters for main types
-    QSet<QString> activeTypes;
-    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::AttrFormat)) {
-        if (filter->type() == CardFilter::Type::TypeAnd) {
-            activeTypes.insert(filter->term());
-        }
-    }
-
-    // Check the buttons for active types
-    for (const auto &type : activeTypes) {
-        activeFormats[type] = true;
-        if (formatButtons.contains(type)) {
-            formatButtons[type]->setChecked(true);
-        }
-    }
-
-    // Re-enable signal emissions for each button
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->blockSignals(false);
-    }
-
-    // Update the visibility of buttons
-    updateFormatButtonsVisibility();
-}

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h

@@ -1,43 +0,0 @@
-#ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
-#define COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
-
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class VisualDatabaseDisplayFormatLegalityFilterWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit VisualDatabaseDisplayFormatLegalityFilterWidget(QWidget *parent, FilterTreeModel *filterModel);
-    void retranslateUi();
-    void createFormatButtons();
-    void updateFormatButtonsVisibility();
-    int getMaxMainTypeCount() const;
-
-    void handleFormatToggled(const QString &format, bool active);
-    void updateFormatFilter();
-    void updateFilterMode(bool checked);
-    void syncWithFilterModel();
-
-private:
-    FilterTreeModel *filterModel;
-    QMap<QString, int> allFormatsWithCount;
-    QSpinBox *spinBox;
-    QHBoxLayout *layout;
-    FlowWidget *flowWidget;
-    QPushButton *toggleButton; // Mode switch button
-
-    QMap<QString, bool> activeFormats;          // Track active filters
-    QMap<QString, QPushButton *> formatButtons; // Store toggle buttons
-
-    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
-};
-
-#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp

@@ -33,7 +33,7 @@ VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWi
     spinBox->setMaximum(getMaxMainTypeCount()); // Set the max value dynamically
     spinBox->setValue(150);
     layout->addWidget(spinBox);
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeButtonsVisibility);
 
     // Create the toggle button for Exact Match/Includes mode

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp

@@ -51,7 +51,7 @@ VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWi
 
 void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 {
-    searchBox->setPlaceholderText(tr("Filter by name... (Exact match)"));
+    searchBox->setPlaceholderText(tr("Filter by name..."));
     loadFromDeckButton->setText(tr("Load from Deck"));
     loadFromDeckButton->setToolTip(tr("Apply all card names in currently loaded deck as exact match name filters"));
     loadFromClipboardButton->setText(tr("Load from Clipboard"));
@@ -68,7 +68,7 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
     if (!decklist)
         return;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         createNameFilter(currentCard->getName());
@@ -123,14 +123,14 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 {
     // Clear existing name filters
     emit filterModel->layoutAboutToBeChanged();
-    filterModel->clearFiltersOfType(CardFilter::Attr::AttrNameExact);
+    filterModel->clearFiltersOfType(CardFilter::Attr::AttrName);
 
     filterModel->blockSignals(true);
     filterModel->filterTree()->blockSignals(true);
 
     for (const auto &name : activeFilters.keys()) {
         QString nameString = name;
-        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrNameExact));
+        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrName));
     }
 
     filterModel->blockSignals(false);
@@ -146,7 +146,7 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 void VisualDatabaseDisplayNameFilterWidget::syncWithFilterModel()
 {
     QStringList currentFilters;
-    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrNameExact)) {
+    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrName)) {
         if (filter->type() == CardFilter::Type::TypeOr) {
             currentFilters.append(filter->term());
         }

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp

@@ -27,7 +27,7 @@ VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentS
     filterToMostRecentSetsAmount->setMaximum(100);
     filterToMostRecentSetsAmount->setValue(
         SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsAmount());
-    connect(filterToMostRecentSetsAmount, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(filterToMostRecentSetsAmount, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
             &SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount);
 
     layout->addWidget(filterToMostRecentSetsCheckBox);

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp

@@ -26,7 +26,7 @@ VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidg
     spinBox->setMaximum(getMaxSubTypeCount());
     spinBox->setValue(150);
     layout->addWidget(spinBox);
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeButtonsVisibility);
 
     // Create search box

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp

@@ -206,7 +206,6 @@ void VisualDatabaseDisplayWidget::initialize()
     saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
     nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
     mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
-    formatLegalityWidget = new VisualDatabaseDisplayFormatLegalityFilterWidget(this, filterModel);
     subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
     setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
 
@@ -224,7 +223,6 @@ void VisualDatabaseDisplayWidget::initialize()
     filterContainerLayout->addWidget(quickFilterSubTypeWidget);
     filterContainerLayout->addWidget(quickFilterSetWidget);
     filterContainerLayout->addWidget(mainTypeFilterWidget);
-    filterContainerLayout->addWidget(formatLegalityWidget);
 
     searchLayout->addWidget(colorFilterWidget);
     searchLayout->addWidget(clearFilterWidget);

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h

@@ -17,7 +17,6 @@
 #include "../utility/custom_line_edit.h"
 #include "visual_database_display_color_filter_widget.h"
 #include "visual_database_display_filter_save_load_widget.h"
-#include "visual_database_display_format_legality_filter_widget.h"
 #include "visual_database_display_main_type_filter_widget.h"
 #include "visual_database_display_name_filter_widget.h"
 #include "visual_database_display_set_filter_widget.h"
@@ -92,7 +91,6 @@ private:
     SettingsButtonWidget *quickFilterNameWidget;
     VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
     VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
-    VisualDatabaseDisplayFormatLegalityFilterWidget *formatLegalityWidget;
     SettingsButtonWidget *quickFilterSubTypeWidget;
     VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
     SettingsButtonWidget *quickFilterSetWidget;

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp

@@ -2,9 +2,7 @@
 
 #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
 
-#include <libcockatrice/utility/qt_utils.h>
-
-VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) : QWidget(parent)
+VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
 {
     groupAndSortLayout = new QHBoxLayout(this);
     groupAndSortLayout->setAlignment(Qt::AlignLeft);
@@ -13,19 +11,23 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     groupByLabel = new QLabel(this);
 
     groupByComboBox = new QComboBox(this);
+    if (auto visualDeckEditorWidget = qobject_cast<VisualDeckEditorWidget *>(parent)) {
+        if (auto tabWidget = qobject_cast<TabDeckEditorVisualTabWidget *>(visualDeckEditorWidget)) {
+            // Inside a central widget QWidget container inside TabDeckEditorVisual
+            if (auto tab = qobject_cast<TabDeckEditorVisual *>(tabWidget->parent()->parent())) {
+                auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
+                groupByComboBox->setModel(originalBox->model());
+                groupByComboBox->setModelColumn(originalBox->modelColumn());
 
-    if (auto tab = QtUtils::findParentOfType<TabDeckEditorVisual>(this)) {
-        auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
-        groupByComboBox->setModel(originalBox->model());
-        groupByComboBox->setModelColumn(originalBox->modelColumn());
+                // Original -> clone
+                connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                        [this](int index) { groupByComboBox->setCurrentIndex(index); });
 
-        // Original -> clone
-        connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                [this](int index) { groupByComboBox->setCurrentIndex(index); });
-
-        // Clone -> original
-        connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                [originalBox](int index) { originalBox->setCurrentIndex(index); });
+                // Clone -> original
+                connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                        [originalBox](int index) { originalBox->setCurrentIndex(index); });
+            }
+        }
     } else {
         groupByComboBox->addItem(
             tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::MAIN_TYPE))),

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -24,9 +24,9 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare
     handSizeSpinBox = new QSpinBox(this);
     handSizeSpinBox->setValue(SettingsCache::instance().getVisualDeckEditorSampleHandSize());
     handSizeSpinBox->setMinimum(1);
-    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
             &SettingsCache::setVisualDeckEditorSampleHandSize);
-    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDeckEditorSampleHandWidget::updateDisplay);
     resetAndHandSizeLayout->addWidget(handSizeSpinBox);
 
@@ -84,7 +84,7 @@ QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGe
     if (!decklist)
         return randomCards;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
 
     // Collect all cards in the main deck, allowing duplicates based on their count
     for (auto currentCard : cardsInDeck) {

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp

@@ -13,8 +13,8 @@
 #include <QHBoxLayout>
 #include <QMessageBox>
 
-DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags)
-    : QWidget(_parent), currentTags(_tags)
+DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList)
+    : QWidget(_parent), deckList(nullptr)
 {
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
@@ -27,14 +27,16 @@ DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_par
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    layout->addWidget(flowWidget);
+    if (_deckList) {
+        setDeckList(_deckList);
+    }
 
-    refreshTags();
+    layout->addWidget(flowWidget);
 }
 
-void DeckPreviewDeckTagsDisplayWidget::setTags(const QStringList &_tags)
+void DeckPreviewDeckTagsDisplayWidget::setDeckList(DeckList *_deckList)
 {
-    currentTags = _tags;
+    deckList = _deckList;
     refreshTags();
 }
 
@@ -42,7 +44,7 @@ void DeckPreviewDeckTagsDisplayWidget::refreshTags()
 {
     flowWidget->clearLayout();
 
-    for (const QString &tag : currentTags) {
+    for (const QString &tag : deckList->getTags()) {
         flowWidget->addWidget(new DeckPreviewTagDisplayWidget(this, tag));
     }
 
@@ -69,45 +71,7 @@ static QStringList getAllFiles(const QString &filePath)
     return allFiles;
 }
 
-/**
- * Gets all tags that appear in the deck folder
- */
-static QStringList findAllKnownTags()
-{
-    QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath());
-
-    QStringList knownTags;
-    auto loader = DeckLoader(nullptr);
-    for (const QString &file : allFiles) {
-        loader.loadFromFile(file, DeckFileFormat::getFormatFromName(file), false);
-        QStringList tags = loader.getDeckList()->getTags();
-        knownTags.append(tags);
-        knownTags.removeDuplicates();
-    }
-
-    return knownTags;
-}
-
-void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
-{
-    if (qobject_cast<DeckPreviewWidget *>(parentWidget())) {
-        // If we're the child of a DeckPreviewWidget, then we need to handle conversion
-        auto *deckPreviewWidget = qobject_cast<DeckPreviewWidget *>(parentWidget());
-
-        bool canAddTags = promptFileConversionIfRequired(deckPreviewWidget);
-
-        if (canAddTags) {
-            QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags();
-            execTagDialog(knownTags);
-        }
-    } else {
-        // If we're the child of an AbstractTabDeckEditor, then we don't bother with conversion
-        QStringList knownTags = findAllKnownTags();
-        execTagDialog(knownTags);
-    }
-}
-
-static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
+bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
 {
     QFileInfo fileInfo(filePath);
     QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
@@ -122,70 +86,98 @@ static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
     return true; // Safe to proceed
 }
 
-static void convertFileToCockatriceFormat(DeckPreviewWidget *deckPreviewWidget)
+void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
 {
-    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
-    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastLoadInfo().fileName;
-    deckPreviewWidget->refreshBannerCardText();
+    if (qobject_cast<DeckPreviewWidget *>(parentWidget())) {
+        auto *deckPreviewWidget = qobject_cast<DeckPreviewWidget *>(parentWidget());
+        QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags();
+        QStringList activeTags = deckList->getTags();
+
+        bool canAddTags = true;
+
+        if (DeckLoader::getFormatFromName(deckPreviewWidget->filePath) != DeckLoader::CockatriceFormat) {
+            canAddTags = false;
+            // Retrieve saved preference if the prompt is disabled
+            if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
+                if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
+
+                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
+                        return;
+
+                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
+                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastLoadInfo().fileName;
+                    deckPreviewWidget->refreshBannerCardText();
+                    canAddTags = true;
+                }
+            } else {
+                // Show the dialog to the user
+                DialogConvertDeckToCodFormat conversionDialog(parentWidget());
+                if (conversionDialog.exec() == QDialog::Accepted) {
+
+                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
+                        return;
+
+                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
+                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastLoadInfo().fileName;
+                    deckPreviewWidget->refreshBannerCardText();
+                    canAddTags = true;
+
+                    if (conversionDialog.dontAskAgain()) {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
+                        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(true);
+                    }
+                } else {
+                    SettingsCache::instance().setVisualDeckStorageAlwaysConvert(false);
+
+                    if (conversionDialog.dontAskAgain()) {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
+                    } else {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(true);
+                    }
+                }
+            }
+        }
+
+        if (canAddTags) {
+            DeckPreviewTagDialog dialog(knownTags, activeTags);
+            if (dialog.exec() == QDialog::Accepted) {
+                QStringList updatedTags = dialog.getActiveTags();
+                deckList->setTags(updatedTags);
+                deckPreviewWidget->deckLoader->saveToFile(deckPreviewWidget->filePath, DeckLoader::CockatriceFormat);
+                refreshTags();
+            }
+        }
+    } else if (parentWidget()) {
+        // If we're the child of an AbstractTabDeckEditor, we are buried under a ton of childWidgets in the
+        // DeckInfoDock.
+        QWidget *currentParent = parentWidget();
+        while (currentParent) {
+            if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
+                break;
+            }
+            currentParent = currentParent->parentWidget();
+        }
+        if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
+            auto *deckEditor = qobject_cast<AbstractTabDeckEditor *>(currentParent);
+            QStringList knownTags;
+            QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath());
+            DeckLoader loader(this);
+            for (const QString &file : allFiles) {
+                loader.loadFromFile(file, DeckLoader::getFormatFromName(file), false);
+                QStringList tags = loader.getDeckList()->getTags();
+                knownTags.append(tags);
+                knownTags.removeDuplicates();
+            }
+
+            QStringList activeTags = deckList->getTags();
+
+            DeckPreviewTagDialog dialog(knownTags, activeTags);
+            if (dialog.exec() == QDialog::Accepted) {
+                QStringList updatedTags = dialog.getActiveTags();
+                deckList->setTags(updatedTags);
+                deckEditor->setModified(true);
+                refreshTags();
+            }
+        }
+    }
 }
-
-/**
- * Checks if the deck's file format supports tags.
- * If not, then prompt the user for file conversion.
- * @return whether the resulting file can support adding tags
- */
-bool DeckPreviewDeckTagsDisplayWidget::promptFileConversionIfRequired(DeckPreviewWidget *deckPreviewWidget)
-{
-    if (DeckFileFormat::getFormatFromName(deckPreviewWidget->filePath) == DeckFileFormat::Cockatrice) {
-        return true;
-    }
-
-    // Retrieve saved preference if the prompt is disabled
-    if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
-        if (!SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
-            return false;
-        }
-
-        if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath)) {
-            return false;
-        }
-
-        convertFileToCockatriceFormat(deckPreviewWidget);
-        return true;
-    }
-
-    // Show the dialog to the user
-    DialogConvertDeckToCodFormat conversionDialog(parentWidget());
-    if (conversionDialog.exec() != QDialog::Accepted) {
-        SettingsCache::instance().setVisualDeckStoragePromptForConversion(!conversionDialog.dontAskAgain());
-        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(false);
-
-        return false;
-    }
-
-    // Try to convert file
-    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath)) {
-        return false;
-    }
-
-    convertFileToCockatriceFormat(deckPreviewWidget);
-
-    if (conversionDialog.dontAskAgain()) {
-        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
-        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(true);
-    }
-
-    return true;
-}
-
-void DeckPreviewDeckTagsDisplayWidget::execTagDialog(const QStringList &knownTags)
-{
-    DeckPreviewTagDialog dialog(knownTags, currentTags);
-    if (dialog.exec() == QDialog::Accepted) {
-        QStringList updatedTags = dialog.getActiveTags();
-        if (updatedTags != currentTags) {
-            setTags(updatedTags);
-            emit tagsChanged(updatedTags);
-        }
-    }
-}

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h

@@ -12,31 +12,21 @@
 
 #include <QWidget>
 
+inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);
+
 class DeckPreviewWidget;
 class DeckPreviewDeckTagsDisplayWidget : public QWidget
 {
     Q_OBJECT
 
-    QStringList currentTags;
-    FlowWidget *flowWidget;
-
 public:
-    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags);
-    void setTags(const QStringList &_tags);
+    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList);
+    void setDeckList(DeckList *_deckList);
     void refreshTags();
+    DeckList *deckList;
+    FlowWidget *flowWidget;
 
 public slots:
     void openTagEditDlg();
-
-private:
-    bool promptFileConversionIfRequired(DeckPreviewWidget *deckPreviewWidget);
-    void execTagDialog(const QStringList &knownTags);
-
-signals:
-    /**
-     * Emitted when the tags have changed due to user interaction.
-     * @param tags The new list of tags.
-     */
-    void tagsChanged(const QStringList &tags);
 };
 #endif // DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp

@@ -32,7 +32,7 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
      many deck loads have finished already and if we've loaded all decks and THEN load all the tags at once. */
     connect(deckLoader, &DeckLoader::loadFinished, visualDeckStorageWidget->tagFilterWidget,
             &VisualDeckStorageTagFilterWidget::refreshTags);
-    deckLoader->loadFromFileAsync(filePath, DeckFileFormat::getFormatFromName(filePath), false);
+    deckLoader->loadFromFileAsync(filePath, DeckLoader::getFormatFromName(filePath), false);
 
     bannerCardDisplayWidget =
         new DeckPreviewCardPictureWidget(this, false, visualDeckStorageWidget->deckPreviewSelectionAnimationEnabled);
@@ -83,8 +83,7 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
     setFilePath(deckLoader->getLastLoadInfo().fileName);
 
     colorIdentityWidget = new ColorIdentityWidget(this, getColorIdentity());
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader->getDeckList()->getTags());
-    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, this, &DeckPreviewWidget::setTags);
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader->getDeckList());
 
     bannerCardLabel = new QLabel(this);
     bannerCardLabel->setObjectName("bannerCardLabel");
@@ -235,7 +234,7 @@ void DeckPreviewWidget::updateBannerCardComboBox()
     // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
 
-    QList<const DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes();
+    QList<DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes();
 
     for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
@@ -288,7 +287,7 @@ void DeckPreviewWidget::setBannerCard(int /* changedIndex */)
     auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
     CardRef cardRef = {name, id};
     deckLoader->getDeckList()->setBannerCard(cardRef);
-    deckLoader->saveToFile(filePath, DeckFileFormat::getFormatFromName(filePath));
+    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
     bannerCardDisplayWidget->setCard(CardDatabaseManager::query()->getCard(cardRef));
 }
 
@@ -308,12 +307,6 @@ void DeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewC
     emit deckLoadRequested(filePath);
 }
 
-void DeckPreviewWidget::setTags(const QStringList &tags)
-{
-    deckLoader->getDeckList()->setTags(tags);
-    deckLoader->saveToFile(filePath, DeckFileFormat::Cockatrice);
-}
-
 QMenu *DeckPreviewWidget::createRightClickMenu()
 {
     auto *menu = new QMenu(this);
@@ -386,7 +379,7 @@ void DeckPreviewWidget::actRenameDeck()
 
     // write change
     deckLoader->getDeckList()->setName(newName);
-    deckLoader->saveToFile(filePath, DeckFileFormat::getFormatFromName(filePath));
+    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
 
     // update VDS
     refreshBannerCardText();
@@ -416,7 +409,7 @@ void DeckPreviewWidget::actRenameFile()
         return;
     }
 
-    LoadedDeck::LoadInfo lastLoadInfo = deckLoader->getLastLoadInfo();
+    DeckLoader::LoadInfo lastLoadInfo = deckLoader->getLastLoadInfo();
     lastLoadInfo.fileName = newFilePath;
     deckLoader->setLastLoadInfo(lastLoadInfo);
 

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h

@@ -72,8 +72,6 @@ private:
     void addSetBannerCardMenu(QMenu *menu);
 
 private slots:
-    void setTags(const QStringList &tags);
-
     void actRenameDeck();
     void actRenameFile();
     void actDeleteFile();

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp

@@ -61,10 +61,10 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     unusedColorIdentitiesOpacitySpinBox->setMaximum(100);
     unusedColorIdentitiesOpacitySpinBox->setValue(
         SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
-    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDeckStorageQuickSettingsWidget::unusedColorIdentitiesOpacityChanged);
-    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+            &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
 
     unusedColorIdentitiesOpacityLabel->setBuddy(unusedColorIdentitiesOpacitySpinBox);
 

dbconverter/src/main.h

@@ -1,16 +1,10 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include "libcockatrice/interfaces/noop_card_set_priority_controller.h"
-
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 
-static const QList<AllowedCount> kConstructedCounts = {{4, "legal"}, {0, "banned"}};
-
-static const QList<AllowedCount> kSingletonCounts = {{1, "legal"}, {0, "banned"}};
-
 class CardDatabaseConverter : public CardDatabase
 {
 public:
@@ -28,74 +22,8 @@ public:
 
     bool saveCardDatabase(const QString &fileName)
     {
-        CockatriceXml4Parser parser(new NoopCardPreferenceProvider(), new NoopCardSetPriorityController());
-
-        return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName);
-    }
-
-    FormatRulesNameMap createDefaultMagicFormats()
-    {
-        // Predefined common exceptions
-        CardCondition superTypeIsBasic;
-        superTypeIsBasic.field = "type";
-        superTypeIsBasic.matchType = "contains";
-        superTypeIsBasic.value = "Basic Land";
-
-        ExceptionRule basicLands;
-        basicLands.conditions.append(superTypeIsBasic);
-
-        CardCondition anyNumberAllowed;
-        anyNumberAllowed.field = "text";
-        anyNumberAllowed.matchType = "contains";
-        anyNumberAllowed.value = "A deck can have any number of";
-
-        ExceptionRule mayContainAnyNumber;
-        mayContainAnyNumber.conditions.append(anyNumberAllowed);
-
-        // Map to store default rules
-        FormatRulesNameMap defaultFormatRulesNameMap;
-
-        // ----------------- Helper lambda to create format -----------------
-        auto makeFormat = [&](const QString &name, int minDeck = 60, int maxDeck = -1, int maxSideboardSize = 15,
-                              const QList<AllowedCount> &allowedCounts = kConstructedCounts) -> FormatRulesPtr {
-            FormatRulesPtr f(new FormatRules);
-            f->formatName = name;
-            f->allowedCounts = allowedCounts;
-            f->minDeckSize = minDeck;
-            f->maxDeckSize = maxDeck;
-            f->maxSideboardSize = maxSideboardSize;
-            f->exceptions.append(basicLands);
-            f->exceptions.append(mayContainAnyNumber);
-            defaultFormatRulesNameMap.insert(name.toLower(), f);
-            return f;
-        };
-
-        // ----------------- Standard formats -----------------
-        makeFormat("Standard");
-        makeFormat("Modern");
-        makeFormat("Legacy");
-        makeFormat("Pioneer");
-        makeFormat("Historic");
-        makeFormat("Timeless");
-        makeFormat("Future");
-        makeFormat("OldSchool");
-        makeFormat("Premodern");
-        makeFormat("Pauper");
-        makeFormat("Penny");
-
-        // ----------------- Singleton formats -----------------
-        makeFormat("Commander", 100, 100, 15, kSingletonCounts);
-        makeFormat("Duel", 100, 100, 15, kSingletonCounts);
-        makeFormat("Brawl", 60, 60, 15, kSingletonCounts);
-        makeFormat("StandardBrawl", 60, 60, 15, kSingletonCounts);
-        makeFormat("Oathbreaker", 60, 60, 15, kSingletonCounts);
-        makeFormat("PauperCommander", 100, 100, 15, kSingletonCounts);
-        makeFormat("Predh", 100, 100, 15, kSingletonCounts);
-
-        // ----------------- Restricted formats -----------------
-        makeFormat("Vintage", 60, -1, 15, {{4, "legal"}, {1, "restricted"}, {0, "banned"}});
-
-        return defaultFormatRulesNameMap;
+        CockatriceXml4Parser parser(new NoopCardPreferenceProvider());
+        return parser.saveToFile(sets, cards, fileName);
     }
 };
 

doc/doxygen/extra-pages/developer_documentation/index.md

@@ -1,7 +1,5 @@
 @page developer_reference Developer Reference
 
-- @subpage logging
-
 - @subpage primer_cards
 
 - @subpage card_database_schema_and_parsing

doc/doxygen/extra-pages/developer_documentation/logging.md

@@ -1,184 +0,0 @@
-@page logging Logging
-
-Cockatrice uses QtLogging from the QtCore module for its logging. See
-the [official documentation](https://doc.qt.io/qt-6/qtlogging.html) for further details.
-
-# Log Message Pattern
-
-Any message logged through the QtLogging system automatically conforms to this message pattern:
-
-Generic:
-
-```
-[<timestamp> <log_level>] [<class:function>] - <message> [<filename>:<line_no>]
-```
-
-Example:
-
-```
-[2025-12-05 14:48:25.908 I] [MainWindow::startupConfigCheck] - Startup: found config with current version [window_main.cpp:951]
-```
-
-For more information, see [Logging Setup](#logging-setup).
-
-# Log Level and Categories
-
-\note The default log level for the application is info.
-
-This means that you should only use qInfo() in production-level code if you are truly sure that this message is
-beneficial to end-users and other developers. As a general rule, if your functionality logs to info more than twice in
-response to a user interaction, you are advised to consider moving some of these logs down to the debug level.
-
-\warning You are strongly advised to avoid the use of the generic logging macros (e.g. qDebug(), qInfo(), qWarn()).
-
-\note You should instead use the corresponding category logging macros (qCDebug(), qCInfo(), qCWarn()) and define
-logging
-categories for your log statements.
-
-Example:
-
-```c++
-in .h
-
-inline Q_LOGGING_CATEGORY(ExampleCategory, "cockatrice_example_category");
-inline Q_LOGGING_CATEGORY(ExampleSubCategory, "cockatrice_example_category.sub_category");
-
-in .cpp
-
-qCInfo(ExampleCategory) << "Info level logs are usually sent through the main category"
-qCDebug(ExampleSubCategory) << "Debug level logs are permitted their own category to allow selective silencing"
-```
-
-For more information on how to enable or disable logging categories,
-see [Logging Configuration](#logging-configuration).
-
-# Logging Configuration
-
-For configuring our logging, we use the qtlogging.ini, located under cockatrice/resources/config/qtlogging.ini, which is
-baked into the application in release version and set as the QT_LOGGING_CONF environment variable in main.cpp.
-
-```c++
-#ifdef Q_OS_APPLE
-    // <build>/cockatrice/cockatrice.app/Contents/MacOS/cockatrice
-    const QByteArray configPath = "../../../qtlogging.ini";
-#elif defined(Q_OS_UNIX)
-    // <build>/cockatrice/cockatrice
-    const QByteArray configPath = "./qtlogging.ini";
-#elif defined(Q_OS_WIN)
-    // <build>/cockatrice/Debug/cockatrice.exe
-    const QByteArray configPath = "../qtlogging.ini";
-#else
-    const QByteArray configPath = "";
-#endif
-
-    if (!qEnvironmentVariableIsSet(("QT_LOGGING_CONF"))) {
-        // Set the QT_LOGGING_CONF environment variable
-        qputenv("QT_LOGGING_CONF", configPath);
-    }
-```
-
-For more information on how to use this file and on how Qt evaluates which logging rules/file to use, please
-see the [official Qt documentation](https://doc.qt.io/qt-6/qloggingcategory.html#configuring-categories).
-
-Some examples:
-
-```
-# Turn off all logging except everything from card_picture_loader and all sub categories
-
-[Rules]
-# The default log level is info
-*.debug = false
-*.info = false
-*.warning = false
-*.critical = false
-*.fatal = false
-
-card_picture_loader.* = true
-```
-
-```
-# Turn off all logging except info level logs from card_picture_loader and all sub categories
-
-[Rules]
-# The default log level is info
-*.debug = false
-*.info = false
-*.warning = false
-*.critical = false
-*.fatal = false
-
-card_picture_loader.*.info = true
-```
-
-```
-[Rules]
-# Turn on debug level logs for card_picture_loader but keep logging for sub categories suppressed
-*.debug = false
-
-card_picture_loader.debug = true
-```
-
-```
-[Rules]
-# Turn on all logs for worker subcategory of card_picture_loader
-*.debug = false
-
-card_picture_loader.worker = true
-```
-
-```
-[Rules]
-# Turn off some noisy and irrelevant startup logging for local development
-*.debug = false
-
-qt_translator = false
-window_main.* = false
-release_channel = false
-spoiler_background_updater = false
-theme_manager = false
-sound_engine = false
-tapped_out_interface = false
-card_database = false
-card_database.loading = false
-card_database.loading.success_or_failure = true
-cockatrice_xml.* = false
-```
-
-# Logging Setup
-
-This is achieved through our logging setup in @ref main.cpp, where we set the message pattern and install a custom
-logger which replaces the full file path at the end with just the file name (Qt shows the full and quite lengthy path by
-default).
-
-```c++
-    qSetMessagePattern(
-        "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
-        "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"
-        "endif}%{if-fatal}\033[1;31mF%{endif}\033[0m] [%{function}] - %{message} [%{file}:%{line}]");
-    QApplication app(argc, argv);
-
-    QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);
-
-    qInstallMessageHandler(CockatriceLogger);
-```
-
-```c++
-static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
-{
-    QString logMessage = qFormatLogMessage(type, ctx, message);
-
-    // Regular expression to match the full path in the square brackets and extract only the filename and line number
-    QRegularExpression regex(R"(\[(?:.:)?[\/\\].*[\/\\]([^\/\\]+\:\d+)\])");
-    QRegularExpressionMatch match = regex.match(logMessage);
-
-    if (match.hasMatch()) {
-        // Extract the filename and line number (e.g., "main.cpp:211")
-        QString filenameLine = match.captured(1);
-
-        // Replace the full path in square brackets with just the filename and line number
-        logMessage.replace(match.captured(0), QString("[%1]").arg(filenameLine));
-    }
-
-    Logger::getInstance().log(type, ctx, logMessage);
-}
-```

libcockatrice_card/CMakeLists.txt

@@ -41,8 +41,6 @@ add_library(
   libcockatrice/card/relation/card_relation.cpp
   libcockatrice/card/set/card_set.cpp
   libcockatrice/card/set/card_set_list.cpp
-  libcockatrice/card/format/format_legality_rules.cpp
-  libcockatrice/card/format/format_legality_rules.h
 )
 
 target_include_directories(

libcockatrice_card/libcockatrice/card/card_info.h

@@ -1,7 +1,6 @@
 #ifndef CARD_INFO_H
 #define CARD_INFO_H
 
-#include "format/format_legality_rules.h"
 #include "printing/printing_info.h"
 
 #include <QDate>
@@ -23,12 +22,10 @@ class ICardDatabaseParser;
 
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
-typedef QSharedPointer<FormatRules> FormatRulesPtr;
 typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
 
 typedef QHash<QString, CardInfoPtr> CardNameMap;
 typedef QHash<QString, CardSetPtr> SetNameMap;
-typedef QHash<QString, FormatRulesPtr> FormatRulesNameMap;
 
 Q_DECLARE_METATYPE(CardInfoPtr)
 

libcockatrice_card/libcockatrice/card/database/card_database.cpp

@@ -21,7 +21,7 @@ CardDatabase::CardDatabase(QObject *parent,
     qRegisterMetaType<CardInfoPtr>("CardSetPtr");
 
     // create loader and wire it up
-    loader = new CardDatabaseLoader(this, this, pathProvider, prefs, setPriorityController);
+    loader = new CardDatabaseLoader(this, this, pathProvider, prefs);
     // re-emit loader signals (so other code doesn't need to know about internals)
     connect(loader, &CardDatabaseLoader::loadingFinished, this, &CardDatabase::cardDatabaseLoadingFinished);
     connect(loader, &CardDatabaseLoader::loadingFailed, this, &CardDatabase::cardDatabaseLoadingFailed);
@@ -199,8 +199,3 @@ void CardDatabase::notifyEnabledSetsChanged()
     // inform the carddatabasemodels that they need to re-check their list of cards
     emit cardDatabaseEnabledSetsChanged();
 }
-
-void CardDatabase::addFormat(FormatRulesPtr format)
-{
-    formats.insert(format->formatName.toLower(), format);
-}

libcockatrice_card/libcockatrice/card/database/card_database.h

@@ -42,8 +42,6 @@ protected:
     /// Sets indexed by short name
     SetNameMap sets;
 
-    FormatRulesNameMap formats;
-
     /// Loader responsible for file discovery and parsing
     CardDatabaseLoader *loader;
 
@@ -143,8 +141,6 @@ public slots:
      */
     void addSet(CardSetPtr set);
 
-    void addFormat(FormatRulesPtr format);
-
     /** @brief Loads card databases from configured paths. */
     void loadCardDatabases();
 

libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp

@@ -12,19 +12,17 @@
 CardDatabaseLoader::CardDatabaseLoader(QObject *parent,
                                        CardDatabase *db,
                                        ICardDatabasePathProvider *_pathProvider,
-                                       ICardPreferenceProvider *_preferenceProvider,
-                                       ICardSetPriorityController *_priorityController)
+                                       ICardPreferenceProvider *_preferenceProvider)
     : QObject(parent), database(db), pathProvider(_pathProvider)
 {
     // instantiate available parsers here and connect them to the database
-    availableParsers << new CockatriceXml4Parser(_preferenceProvider, _priorityController);
-    availableParsers << new CockatriceXml3Parser(_priorityController);
+    availableParsers << new CockatriceXml4Parser(_preferenceProvider);
+    availableParsers << new CockatriceXml3Parser;
 
     for (auto *p : availableParsers) {
         // connect parser outputs to the database adders
         connect(p, &ICardDatabaseParser::addCard, database, &CardDatabase::addCard, Qt::DirectConnection);
         connect(p, &ICardDatabaseParser::addSet, database, &CardDatabase::addSet, Qt::DirectConnection);
-        connect(p, &ICardDatabaseParser::addFormat, database, &CardDatabase::addFormat, Qt::DirectConnection);
     }
 
     // when SettingsCache's path changes, trigger reloads
@@ -151,6 +149,6 @@ bool CardDatabaseLoader::saveCustomTokensToFile()
         }
     }
 
-    availableParsers.first()->saveToFile(FormatRulesNameMap(), tmpSets, tmpCards, fileName);
+    availableParsers.first()->saveToFile(tmpSets, tmpCards, fileName);
     return true;
 }

libcockatrice_card/libcockatrice/card/database/card_database_loader.h

@@ -6,7 +6,6 @@
 #include <QLoggingCategory>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
@@ -53,8 +52,7 @@ public:
     explicit CardDatabaseLoader(QObject *parent,
                                 CardDatabase *db,
                                 ICardDatabasePathProvider *pathProvider,
-                                ICardPreferenceProvider *preferenceProvider,
-                                ICardSetPriorityController *_priorityController);
+                                ICardPreferenceProvider *preferenceProvider);
 
     /** @brief Destructor cleans up allocated parsers. */
     ~CardDatabaseLoader() override;

libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp

@@ -341,27 +341,4 @@ QMap<QString, int> CardDatabaseQuerier::getAllSubCardTypesWithCount() const
     }
 
     return typeCounts;
-}
-
-FormatRulesPtr CardDatabaseQuerier::getFormat(const QString &formatName) const
-{
-    return db->formats.value(formatName.toLower());
-}
-
-QMap<QString, int> CardDatabaseQuerier::getAllFormatsWithCount() const
-{
-    QMap<QString, int> formatCounts;
-
-    for (const auto &card : db->cards.values()) {
-        QStringList allProps = card->getProperties();
-
-        for (const QString &prop : allProps) {
-            if (prop.startsWith("format-")) {
-                QString formatName = prop.mid(QStringLiteral("format-").size());
-                formatCounts[formatName]++;
-            }
-        }
-    }
-
-    return formatCounts;
 }

libcockatrice_card/libcockatrice/card/database/card_database_querier.h

@@ -214,8 +214,6 @@ public:
      * @return Map of subtype string to count.
      */
     [[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
-    FormatRulesPtr getFormat(const QString &formatName) const;
-    QMap<QString, int> getAllFormatsWithCount() const;
 
 private:
     const CardDatabase *db;               //!< Card database used for all lookups.

libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp

@@ -4,10 +4,6 @@
 
 SetNameMap ICardDatabaseParser::sets;
 
-ICardDatabaseParser::ICardDatabaseParser(ICardSetPriorityController *_cardSetPriorityController)
-    : cardSetPriorityController(_cardSetPriorityController)
-{
-}
 void ICardDatabaseParser::clearSetlist()
 {
     sets.clear();
@@ -23,7 +19,7 @@ CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
         return sets.value(setName);
     }
 
-    CardSetPtr newSet = CardSet::newInstance(cardSetPriorityController, setName);
+    CardSetPtr newSet = CardSet::newInstance(new NoopCardSetPriorityController(), setName);
     newSet->setLongName(longName);
     newSet->setSetType(setType);
     newSet->setReleaseDate(releaseDate);

libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h

@@ -20,7 +20,6 @@ class ICardDatabaseParser : public QObject
 {
     Q_OBJECT
 public:
-    ICardDatabaseParser(ICardSetPriorityController *cardSetPriorityController);
     ~ICardDatabaseParser() override = default;
 
     /**
@@ -39,7 +38,6 @@ public:
 
     /**
      * @brief Saves card and set data to a file.
-     * @param _formats
      * @param sets Map of sets to save.
      * @param cards Map of cards to save.
      * @param fileName Target file path.
@@ -47,8 +45,7 @@ public:
      * @param sourceVersion Optional version string of the source.
      * @return true if save succeeded.
      */
-    virtual bool saveToFile(FormatRulesNameMap _formats,
-                            SetNameMap sets,
+    virtual bool saveToFile(SetNameMap sets,
                             CardNameMap cards,
                             const QString &fileName,
                             const QString &sourceUrl = "unknown",
@@ -60,7 +57,6 @@ public:
 protected:
     /** @brief Cached global list of sets shared between all parsers. */
     static SetNameMap sets;
-    ICardSetPriorityController *cardSetPriorityController;
 
     /**
      * @brief Internal helper to add a set to the global set cache.
@@ -83,8 +79,6 @@ signals:
 
     /** Emitted when a set is loaded from the database. */
     void addSet(CardSetPtr set);
-
-    void addFormat(FormatRulesPtr format);
 };
 
 Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp

@@ -14,11 +14,6 @@
 #define COCKATRICE_XML3_SCHEMALOCATION                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v3/cards.xsd"
 
-CockatriceXml3Parser::CockatriceXml3Parser(ICardSetPriorityController *_cardSetPriorityController)
-    : ICardDatabaseParser(_cardSetPriorityController)
-{
-}
-
 bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
     qCInfo(CockatriceXml3Log) << "Trying to parse: " << fileName;
@@ -443,15 +438,12 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats,
-                                      SetNameMap _sets,
+bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
                                       const QString &sourceVersion)
 {
-    Q_UNUSED(_formats);
-
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
         return false;

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h

@@ -26,7 +26,7 @@ class CockatriceXml3Parser : public ICardDatabaseParser
 {
     Q_OBJECT
 public:
-    CockatriceXml3Parser(ICardSetPriorityController *cardSetPriorityController);
+    CockatriceXml3Parser() = default;
     ~CockatriceXml3Parser() override = default;
 
     /**
@@ -46,8 +46,7 @@ public:
     /**
      * @brief Save sets and cards back to an XML3 file.
      */
-    bool saveToFile(FormatRulesNameMap _formats,
-                    SetNameMap _sets,
+    bool saveToFile(SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp

@@ -6,7 +6,6 @@
 #include <QDebug>
 #include <QFile>
 #include <QXmlStreamReader>
-#include <libcockatrice/card/format/format_legality_rules.h>
 #include <version_string.h>
 
 #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase"
@@ -14,9 +13,8 @@
 #define COCKATRICE_XML4_SCHEMALOCATION                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v4/cards.xsd"
 
-CockatriceXml4Parser::CockatriceXml4Parser(ICardPreferenceProvider *_cardPreferenceProvider,
-                                           ICardSetPriorityController *_cardSetPriorityController)
-    : ICardDatabaseParser(_cardSetPriorityController), cardPreferenceProvider(_cardPreferenceProvider)
+CockatriceXml4Parser::CockatriceXml4Parser(ICardPreferenceProvider *_cardPreferenceProvider)
+    : cardPreferenceProvider(_cardPreferenceProvider)
 {
 }
 
@@ -62,9 +60,7 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
                 }
 
                 auto xmlName = xml.name().toString();
-                if (xmlName == "formats") {
-                    loadFormats(xml);
-                } else if (xmlName == "sets") {
+                if (xmlName == "sets") {
                     loadSetsFromXml(xml);
                 } else if (xmlName == "cards") {
                     loadCardsFromXml(xml);
@@ -82,116 +78,6 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
     }
 }
 
-static QSharedPointer<FormatRules> parseFormat(QXmlStreamReader &xml)
-{
-    auto rulesPtr = FormatRulesPtr(new FormatRules());
-
-    if (xml.attributes().hasAttribute("formatName")) {
-        rulesPtr->formatName = xml.attributes().value("formatName").toString();
-    }
-
-    while (!xml.atEnd()) {
-        auto token = xml.readNext();
-
-        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "format") {
-            break;
-        }
-
-        if (token != QXmlStreamReader::StartElement) {
-            continue;
-        }
-
-        QString xmlName = xml.name().toString();
-
-        if (xmlName == "minDeckSize") {
-            rulesPtr->minDeckSize = xml.readElementText().toInt();
-        } else if (xmlName == "maxDeckSize") {
-            QString text = xml.readElementText();
-            rulesPtr->maxDeckSize = text.toInt();
-        } else if (xmlName == "maxSideboardSize") {
-            rulesPtr->maxSideboardSize = xml.readElementText().toInt();
-        } else if (xmlName == "allowedCounts") {
-            while (!xml.atEnd()) {
-                token = xml.readNext();
-
-                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "allowedCounts") {
-                    break;
-                }
-
-                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "count") {
-
-                    AllowedCount c;
-
-                    QString maxAttr = xml.attributes().value("max").toString();
-                    c.max = (maxAttr == "unlimited") ? -1 : maxAttr.toInt();
-
-                    c.label = xml.readElementText().trimmed();
-
-                    rulesPtr->allowedCounts.append(c);
-                }
-            }
-        } else if (xmlName == "exceptions") {
-            while (!xml.atEnd()) {
-                token = xml.readNext();
-
-                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exceptions") {
-                    break;
-                }
-
-                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "exception") {
-                    ExceptionRule ex;
-
-                    while (!xml.atEnd()) {
-                        token = xml.readNext();
-
-                        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exception") {
-                            break;
-                        }
-
-                        if (token == QXmlStreamReader::StartElement) {
-                            QString ename = xml.name().toString();
-
-                            if (ename == "maxCopies") {
-                                QString text = xml.readElementText();
-                                ex.maxCopies = (text == "unlimited") ? -1 : text.toInt();
-                            } else if (ename == "cardCondition") {
-                                CardCondition cond;
-                                cond.field = xml.attributes().value("field").toString();
-                                cond.matchType = xml.attributes().value("match").toString();
-                                cond.value = xml.attributes().value("value").toString();
-                                ex.conditions.append(cond);
-                                xml.skipCurrentElement();
-                            } else {
-                                xml.skipCurrentElement();
-                            }
-                        }
-                    }
-
-                    rulesPtr->exceptions.append(ex);
-                }
-            }
-        } else {
-            xml.skipCurrentElement();
-        }
-    }
-
-    return rulesPtr;
-}
-
-void CockatriceXml4Parser::loadFormats(QXmlStreamReader &xml)
-{
-    while (!xml.atEnd()) {
-        if (xml.readNext() == QXmlStreamReader::EndElement) {
-            break;
-        }
-
-        if (xml.name().toString() == "format") {
-            auto rulesPtr = parseFormat(xml);
-            emit addFormat(rulesPtr);
-        }
-    }
-}
-
 void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
 {
     while (!xml.atEnd()) {
@@ -387,59 +273,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
     }
 }
 
-static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const QSharedPointer<FormatRules> &rulesPtr)
-{
-    if (rulesPtr.isNull()) {
-        qCWarning(CockatriceXml4Log) << "&operator<< FormatRules is nullptr";
-        return xml;
-    }
-
-    const FormatRules &rules = *rulesPtr;
-
-    xml.writeStartElement("format");
-    if (!rules.formatName.isEmpty()) {
-        xml.writeAttribute("formatName", rules.formatName);
-    }
-
-    xml.writeTextElement("minDeckSize", QString::number(rules.minDeckSize));
-    xml.writeTextElement("maxDeckSize", rules.maxDeckSize >= 0 ? QString::number(rules.maxDeckSize) : "0");
-    xml.writeTextElement("maxSideboardSize", QString::number(rules.maxSideboardSize));
-    if (!rules.allowedCounts.isEmpty()) {
-        xml.writeStartElement("allowedCounts");
-
-        for (const AllowedCount &c : rules.allowedCounts) {
-            xml.writeStartElement("count");
-            xml.writeAttribute("max", c.max == -1 ? "unlimited" : QString::number(c.max));
-            xml.writeCharacters(c.label);
-            xml.writeEndElement(); // count
-        }
-
-        xml.writeEndElement(); // allowedCounts
-    }
-
-    if (!rules.exceptions.isEmpty()) {
-        xml.writeStartElement("exceptions");
-        for (const ExceptionRule &ex : rules.exceptions) {
-            xml.writeStartElement("exception");
-            xml.writeTextElement("maxCopies", ex.maxCopies == -1 ? "unlimited" : QString::number(ex.maxCopies));
-
-            for (const CardCondition &cond : ex.conditions) {
-                xml.writeStartElement("cardCondition");
-                xml.writeAttribute("field", cond.field);
-                xml.writeAttribute("match", cond.matchType);
-                xml.writeAttribute("value", cond.value);
-                xml.writeEndElement(); // cardCondition
-            }
-
-            xml.writeEndElement(); // exception
-        }
-        xml.writeEndElement(); // exceptions
-    }
-
-    xml.writeEndElement(); // format
-    return xml;
-}
-
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
     if (set.isNull()) {
@@ -566,8 +399,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
-                                      SetNameMap _sets,
+bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
@@ -594,14 +426,6 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
     xml.writeTextElement("sourceVersion", sourceVersion);
     xml.writeEndElement();
 
-    if (_formats.count() > 0) {
-        xml.writeStartElement("formats");
-        for (FormatRulesPtr format : _formats) {
-            xml << format;
-        }
-        xml.writeEndElement();
-    }
-
     if (_sets.count() > 0) {
         xml.writeStartElement("sets");
         for (CardSetPtr set : _sets) {

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h

@@ -29,8 +29,7 @@ class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT
 public:
-    explicit CockatriceXml4Parser(ICardPreferenceProvider *cardPreferenceProvider,
-                                  ICardSetPriorityController *cardSetPriorityController);
+    explicit CockatriceXml4Parser(ICardPreferenceProvider *cardPreferenceProvider);
     ~CockatriceXml4Parser() override = default;
 
     /**
@@ -50,8 +49,7 @@ public:
     /**
      * @brief Save sets and cards back to an XML4 file.
      */
-    bool saveToFile(FormatRulesNameMap _formats,
-                    SetNameMap _sets,
+    bool saveToFile(SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",
@@ -74,7 +72,6 @@ private:
      */
     void loadCardsFromXml(QXmlStreamReader &xml);
 
-    void loadFormats(QXmlStreamReader &xml);
     /**
      * @brief Load all <set> elements from the XML stream.
      * @param xml The open QXmlStreamReader positioned at the <sets> element.

libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp

@@ -1,53 +0,0 @@
-#include "format_legality_rules.h"
-
-#include <libcockatrice/card/card_info.h>
-
-bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond)
-{
-    CardMatchType type = matchTypeFromString(cond.matchType);
-    QString fieldValue;
-    if (cond.field == "name") {
-        fieldValue = card.getName();
-    } else if (cond.field == "text") {
-        fieldValue = card.getText();
-    } else {
-        fieldValue = card.getProperty(cond.field);
-    }
-
-    switch (type) {
-        case CardMatchType::Equals:
-            return fieldValue == cond.value;
-        case CardMatchType::NotEquals:
-            return fieldValue != cond.value;
-        case CardMatchType::Contains:
-            return fieldValue.contains(cond.value, Qt::CaseInsensitive);
-        case CardMatchType::NotContains:
-            return !fieldValue.contains(cond.value, Qt::CaseInsensitive);
-        case CardMatchType::Regex: {
-            QRegularExpression re(cond.value, QRegularExpression::CaseInsensitiveOption);
-            return re.match(fieldValue).hasMatch();
-        }
-        default:
-            return false;
-    }
-}
-
-bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule)
-{
-    for (const CardCondition &cond : rule.conditions) {
-        if (!cardMatchesCondition(card, cond)) {
-            return false; // all conditions must match
-        }
-    }
-    return true;
-}
-
-bool cardHasAnyException(const CardInfo &card, const FormatRules &format)
-{
-    for (const ExceptionRule &rule : format.exceptions) {
-        if (exceptionAppliesToCard(card, rule)) {
-            return true;
-        }
-    }
-    return false;
-}

libcockatrice_card/libcockatrice/card/format/format_legality_rules.h

@@ -1,73 +0,0 @@
-#ifndef COCKATRICE_FORMAT_LEGALITY_RULES_H
-#define COCKATRICE_FORMAT_LEGALITY_RULES_H
-
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QString>
-
-class CardInfo;
-using CardInfoPtr = QSharedPointer<CardInfo>;
-
-struct CardCondition
-{
-    QString field;     // e.g. "type", "maintype", "text"
-    QString matchType; // "contains", "equals", "regex", "notContains", etc.
-    QString value;     // e.g. "Basic Land"
-};
-
-struct AllowedCount
-{
-    int max = 0;   // 4, 1, 0, or -1 for unlimited
-    QString label; // "legal", "restricted", "banned"
-};
-
-struct ExceptionRule
-{
-    QList<CardCondition> conditions; // All must match
-    int maxCopies = -1;              // -1 = unlimited
-};
-
-struct FormatRules
-{
-    QString formatName;
-    int minDeckSize = 60;
-    int maxDeckSize = -1; // -1 = unlimited
-    int maxSideboardSize = 15;
-
-    QList<AllowedCount> allowedCounts;
-
-    QList<ExceptionRule> exceptions; // Cards allowed to break maxCopies
-};
-
-enum class CardMatchType
-{
-    Equals,
-    NotEquals,
-    Contains,
-    NotContains,
-    Regex
-};
-
-// convert string to enum
-inline CardMatchType matchTypeFromString(const QString &str)
-{
-    if (str == "equals")
-        return CardMatchType::Equals;
-    if (str == "notEquals")
-        return CardMatchType::NotEquals;
-    if (str == "contains")
-        return CardMatchType::Contains;
-    if (str == "notContains")
-        return CardMatchType::NotContains;
-    if (str == "regex")
-        return CardMatchType::Regex;
-    return CardMatchType::Equals; // fallback default
-}
-
-bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond);
-
-bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule);
-
-bool cardHasAnyException(const CardInfo &card, const FormatRules &format);
-
-#endif // COCKATRICE_FORMAT_LEGALITY_RULES_H

libcockatrice_deck_list/CMakeLists.txt

@@ -27,8 +27,6 @@ add_library(
   libcockatrice/deck_list/tree/inner_deck_list_node.cpp
   libcockatrice/deck_list/deck_list.cpp
   libcockatrice/deck_list/deck_list_history_manager.cpp
-  libcockatrice/deck_list/deck_list_node_tree.cpp
-  libcockatrice/deck_list/deck_list_node_tree.h
 )
 
 add_dependencies(libcockatrice_deck_list libcockatrice_protocol)

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp

@@ -83,23 +83,26 @@ bool DeckList::Metadata::isEmpty() const
 }
 
 DeckList::DeckList()
+{
+    root = new InnerDecklistNode;
+}
+
+DeckList::DeckList(const DeckList &other)
+    : metadata(other.metadata), sideboardPlans(other.sideboardPlans), root(new InnerDecklistNode(other.getRoot())),
+      cachedDeckHash(other.cachedDeckHash)
 {
 }
 
 DeckList::DeckList(const QString &nativeString)
 {
+    root = new InnerDecklistNode;
     loadFromString_Native(nativeString);
 }
 
-DeckList::DeckList(const Metadata &metadata,
-                   const DecklistNodeTree &tree,
-                   const QMap<QString, SideboardPlan *> &sideboardPlans)
-    : metadata(metadata), sideboardPlans(sideboardPlans), tree(tree)
-{
-}
-
 DeckList::~DeckList()
 {
+    delete root;
+
     QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
     while (i.hasNext())
         delete i.next().value();
@@ -133,8 +136,6 @@ bool DeckList::readElement(QXmlStreamReader *xml)
             metadata.lastLoadedTimestamp = xml->readElementText();
         } else if (childName == "deckname") {
             metadata.name = xml->readElementText();
-        } else if (childName == "format") {
-            metadata.gameFormat = xml->readElementText();
         } else if (childName == "comments") {
             metadata.comments = xml->readElementText();
         } else if (childName == "bannerCard") {
@@ -149,7 +150,8 @@ bool DeckList::readElement(QXmlStreamReader *xml)
                 }
             }
         } else if (childName == "zone") {
-            tree.readZoneElement(xml);
+            InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString());
+            newZone->readElement(xml);
         } else if (childName == "sideboard_plan") {
             SideboardPlan *newSideboardPlan = new SideboardPlan;
             if (newSideboardPlan->readElement(xml)) {
@@ -164,11 +166,10 @@ bool DeckList::readElement(QXmlStreamReader *xml)
     return true;
 }
 
-static void writeMetadata(QXmlStreamWriter *xml, const DeckList::Metadata &metadata)
+void writeMetadata(QXmlStreamWriter *xml, const DeckList::Metadata &metadata)
 {
     xml->writeTextElement("lastLoadedTimestamp", metadata.lastLoadedTimestamp);
     xml->writeTextElement("deckname", metadata.name);
-    xml->writeTextElement("format", metadata.gameFormat);
     xml->writeStartElement("bannerCard");
     xml->writeAttribute("providerId", metadata.bannerCard.providerId);
     xml->writeCharacters(metadata.bannerCard.name);
@@ -191,7 +192,9 @@ void DeckList::write(QXmlStreamWriter *xml) const
     writeMetadata(xml, metadata);
 
     // Write zones
-    tree.write(xml);
+    for (int i = 0; i < root->size(); i++) {
+        root->at(i)->writeElement(xml);
+    }
 
     // Write sideboard plans
     QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
@@ -450,13 +453,25 @@ bool DeckList::loadFromStream_Plain(QTextStream &in, bool preserveMetadata)
         QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
 
         // make new entry in decklist
-        tree.addCard(cardName, amount, zoneName, -1, setCode, collectorNumber);
+        new DecklistCardNode(cardName, amount, getZoneObjFromName(zoneName), -1, setCode, collectorNumber);
     }
 
     refreshDeckHash();
     return true;
 }
 
+InnerDecklistNode *DeckList::getZoneObjFromName(const QString &zoneName)
+{
+    for (int i = 0; i < root->size(); i++) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (node->getName() == zoneName) {
+            return node;
+        }
+    }
+
+    return new InnerDecklistNode(zoneName, root);
+}
+
 bool DeckList::loadFromFile_Plain(QIODevice *device)
 {
     QTextStream in(device);
@@ -501,70 +516,184 @@ QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappe
  */
 void DeckList::cleanList(bool preserveMetadata)
 {
-    tree.clear();
+    root->clearTree();
     if (!preserveMetadata) {
         metadata = {};
     }
     refreshDeckHash();
 }
 
+void DeckList::getCardListHelper(InnerDecklistNode *item, QSet<QString> &result)
+{
+    for (int i = 0; i < item->size(); ++i) {
+        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+
+        if (node) {
+            result.insert(node->getName());
+        } else {
+            getCardListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
+        }
+    }
+}
+
+void DeckList::getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result)
+{
+    for (int i = 0; i < item->size(); ++i) {
+        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+
+        if (node) {
+            result.append(node->toCardRef());
+        } else {
+            getCardRefListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
+        }
+    }
+}
+
 QStringList DeckList::getCardList() const
 {
-    auto nodes = tree.getCardNodes();
-
-    QStringList result;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result), [](auto node) { return node->getName(); });
-
-    return result;
+    QSet<QString> result;
+    getCardListHelper(root, result);
+    return result.values();
 }
 
 QList<CardRef> DeckList::getCardRefList() const
 {
-    auto nodes = tree.getCardNodes();
-
     QList<CardRef> result;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result),
-                   [](auto node) { return node->toCardRef(); });
+    getCardRefListHelper(root, result);
+    return result;
+}
+
+QList<DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZones) const
+{
+    QList<DecklistCardNode *> result;
+
+    for (auto *node : *root) {
+        auto *zoneNode = dynamic_cast<InnerDecklistNode *>(node);
+        if (zoneNode == nullptr) {
+            continue;
+        }
+        if (!restrictToZones.isEmpty() && !restrictToZones.contains(node->getName())) {
+            continue;
+        }
+        for (auto *cardNode : *zoneNode) {
+            auto *cardCardNode = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (cardCardNode != nullptr) {
+                result.append(cardCardNode);
+            }
+        }
+    }
 
     return result;
 }
 
-QList<const DecklistCardNode *> DeckList::getCardNodes(const QSet<QString> &restrictToZones) const
-{
-    return tree.getCardNodes(restrictToZones);
-}
-
-QList<const InnerDecklistNode *> DeckList::getZoneNodes() const
-{
-    return tree.getZoneNodes();
-}
-
 int DeckList::getSideboardSize() const
 {
-    auto cards = tree.getCardNodes({DECK_ZONE_SIDE});
-
     int size = 0;
-    for (auto card : cards) {
-        size += card->getNumber();
-    }
+    for (int i = 0; i < root->size(); ++i) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (node->getName() != DECK_ZONE_SIDE) {
+            continue;
+        }
 
+        for (int j = 0; j < node->size(); j++) {
+            auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+            size += card->getNumber();
+        }
+    }
     return size;
 }
 
 DecklistCardNode *DeckList::addCard(const QString &cardName,
                                     const QString &zoneName,
-                                    int position,
+                                    const int position,
                                     const QString &cardSetName,
                                     const QString &cardSetCollectorNumber,
-                                    const QString &cardProviderId,
-                                    bool formatLegal)
+                                    const QString &cardProviderId)
 {
-    auto node =
-        tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
+    auto *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
+    if (zoneNode == nullptr) {
+        zoneNode = new InnerDecklistNode(zoneName, root);
+    }
+
+    auto *node =
+        new DecklistCardNode(cardName, 1, zoneNode, position, cardSetName, cardSetCollectorNumber, cardProviderId);
     refreshDeckHash();
+
     return node;
 }
 
+bool DeckList::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
+{
+    if (node == root) {
+        return true;
+    }
+
+    bool updateHash = false;
+    if (rootNode == nullptr) {
+        rootNode = root;
+        updateHash = true;
+    }
+
+    int index = rootNode->indexOf(node);
+    if (index != -1) {
+        delete rootNode->takeAt(index);
+
+        if (rootNode->empty()) {
+            deleteNode(rootNode, rootNode->getParent());
+        }
+
+        if (updateHash) {
+            refreshDeckHash();
+        }
+
+        return true;
+    }
+
+    for (int i = 0; i < rootNode->size(); i++) {
+        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
+        if (inner) {
+            if (deleteNode(node, inner)) {
+                if (updateHash) {
+                    refreshDeckHash();
+                }
+
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+static QString computeDeckHash(const InnerDecklistNode *root)
+{
+    QStringList cardList;
+    QSet<QString> hashZones, optionalZones;
+
+    hashZones << DECK_ZONE_MAIN << DECK_ZONE_SIDE; // Zones in deck to be included in hashing process
+    optionalZones << DECK_ZONE_TOKENS;             // Optional zones in deck not included in hashing process
+
+    for (int i = 0; i < root->size(); i++) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        for (int j = 0; j < node->size(); j++) {
+            if (hashZones.contains(node->getName())) // Mainboard or Sideboard
+            {
+                auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+                for (int k = 0; k < card->getNumber(); ++k) {
+                    cardList.append((node->getName() == DECK_ZONE_SIDE ? "SB:" : "") + card->getName().toLower());
+                }
+            }
+        }
+    }
+    cardList.sort();
+    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
+    quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
+                     (((quint64)(unsigned char)deckHashArray[1]) << 24) +
+                     (((quint64)(unsigned char)deckHashArray[2] << 16)) +
+                     (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4];
+    return QString::number(number, 32).rightJustified(8, '0');
+}
+
 /**
  * Gets the deck hash.
  * The hash is computed on the first call to this method, and is cached until the decklist is modified.
@@ -577,7 +706,7 @@ QString DeckList::getDeckHash() const
         return cachedDeckHash;
     }
 
-    cachedDeckHash = tree.computeDeckHash();
+    cachedDeckHash = computeDeckHash(root);
     return cachedDeckHash;
 }
 
@@ -594,7 +723,15 @@ void DeckList::refreshDeckHash()
  */
 void DeckList::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
 {
-    tree.forEachCard(func);
+    // Support for this is only possible if the internal structure
+    // doesn't get more complicated.
+    for (int i = 0; i < root->size(); i++) {
+        InnerDecklistNode *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        for (int j = 0; j < node->size(); j++) {
+            DecklistCardNode *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+            func(node, card);
+        }
+    }
 }
 
 DeckListMemento DeckList::createMemento(const QString &reason) const

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h

@@ -11,7 +11,6 @@
 #define DECKLIST_H
 
 #include "deck_list_memento.h"
-#include "deck_list_node_tree.h"
 #include "tree/inner_deck_list_node.h"
 
 #include <QMap>
@@ -108,14 +107,14 @@ public:
  * - Provide hashing for deck identity (deck hash).
  *
  * ### Ownership:
- * - Owns the `DecklistNodeTree`.
+ * - Owns the root `InnerDecklistNode` tree.
  * - Owns `SideboardPlan` instances stored in `sideboardPlans`.
  *
  * ### Example workflow:
  * ```
  * DeckList deck;
  * deck.setName("Mono Red Aggro");
- * deck.addCard("Lightning Bolt", "main");
+ * deck.addCard("Lightning Bolt", "main", -1);
  * deck.addTag("Aggro");
  * deck.saveToFile_Native(device);
  * ```
@@ -127,7 +126,6 @@ public:
     {
         QString name;                ///< User-defined deck name.
         QString comments;            ///< Free-form comments or notes.
-        QString gameFormat;          ///< The name of the game format this deck contains legal cards for
         CardRef bannerCard;          ///< Optional representative card for the deck.
         QStringList tags;            ///< User-defined tags for deck classification.
         QString lastLoadedTimestamp; ///< Timestamp string of last load.
@@ -141,7 +139,7 @@ public:
 private:
     Metadata metadata;                             ///< Deck metadata that is stored in the deck file
     QMap<QString, SideboardPlan *> sideboardPlans; ///< Named sideboard plans.
-    DecklistNodeTree tree;                         ///< The deck tree (zones + cards).
+    InnerDecklistNode *root;                       ///< Root of the deck tree (zones + cards).
 
     /**
      * @brief Cached deck hash, recalculated lazily.
@@ -149,6 +147,11 @@ private:
      */
     mutable QString cachedDeckHash;
 
+    // Helpers for traversing the tree
+    static void getCardListHelper(InnerDecklistNode *node, QSet<QString> &result);
+    static void getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result);
+    InnerDecklistNode *getZoneObjFromName(const QString &zoneName);
+
 public:
     /// @name Metadata setters
     ///@{
@@ -180,36 +183,20 @@ public:
     {
         metadata.lastLoadedTimestamp = _lastLoadedTimestamp;
     }
-    void setGameFormat(const QString &_gameFormat = QString())
-    {
-        metadata.gameFormat = _gameFormat;
-    }
     ///@}
 
     /// @brief Construct an empty deck.
     explicit DeckList();
+    /// @brief Copy constructor (deep copies the node tree)
+    DeckList(const DeckList &other);
     /// @brief Construct from a serialized native-format string.
     explicit DeckList(const QString &nativeString);
-    /// @brief Construct from components
-    DeckList(const Metadata &metadata,
-             const DecklistNodeTree &tree,
-             const QMap<QString, SideboardPlan *> &sideboardPlans = {});
     virtual ~DeckList();
 
-    /**
-     * @brief Gets a pointer to the underlying node tree.
-     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
-     * For now, only the DeckListModel should be calling this.
-     */
-    DecklistNodeTree *getTree()
-    {
-        return &tree;
-    }
-
     /// @name Metadata getters
     /// The individual metadata getters still exist for backwards compatibility.
+    /// TODO: Figure out when we can remove them.
     ///@{
-    //! \todo Figure out when we can remove them.
     const Metadata &getMetadata() const
     {
         return metadata;
@@ -234,10 +221,6 @@ public:
     {
         return metadata.lastLoadedTimestamp;
     }
-    QString getGameFormat() const
-    {
-        return metadata.gameFormat;
-    }
     ///@}
 
     bool isBlankDeck() const
@@ -280,21 +263,23 @@ public:
     void cleanList(bool preserveMetadata = false);
     bool isEmpty() const
     {
-        return tree.isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty();
+        return root->isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty();
     }
     QStringList getCardList() const;
     QList<CardRef> getCardRefList() const;
-    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
-    QList<const InnerDecklistNode *> getZoneNodes() const;
+    QList<DecklistCardNode *> getCardNodes(const QStringList &restrictToZones = QStringList()) const;
     int getSideboardSize() const;
-
+    InnerDecklistNode *getRoot() const
+    {
+        return root;
+    }
     DecklistCardNode *addCard(const QString &cardName,
                               const QString &zoneName,
-                              int position = -1,
+                              int position,
                               const QString &cardSetName = QString(),
                               const QString &cardSetCollectorNumber = QString(),
-                              const QString &cardProviderId = QString(),
-                              const bool formatLegal = true);
+                              const QString &cardProviderId = QString());
+    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
     ///@}
 
     /// @name Deck identity

libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp

@@ -1,186 +0,0 @@
-#include "deck_list_node_tree.h"
-
-#include "tree/deck_list_card_node.h"
-
-#include <QCryptographicHash>
-#include <QSet>
-
-DecklistNodeTree::DecklistNodeTree() : root(new InnerDecklistNode())
-{
-}
-
-DecklistNodeTree::DecklistNodeTree(const DecklistNodeTree &other) : root(new InnerDecklistNode(other.root))
-{
-}
-
-DecklistNodeTree &DecklistNodeTree::operator=(const DecklistNodeTree &other)
-{
-    if (this != &other) {
-        delete root;
-        root = new InnerDecklistNode(other.root);
-    }
-    return *this;
-}
-
-DecklistNodeTree::~DecklistNodeTree()
-{
-    delete root;
-}
-
-bool DecklistNodeTree::isEmpty() const
-{
-    return root->isEmpty();
-}
-
-void DecklistNodeTree::clear()
-{
-    root->clearTree();
-}
-
-QList<const DecklistCardNode *> DecklistNodeTree::getCardNodes(const QSet<QString> &restrictToZones) const
-{
-    QList<const DecklistCardNode *> result;
-
-    for (auto *zoneNode : getZoneNodes()) {
-        if (!restrictToZones.isEmpty() && !restrictToZones.contains(zoneNode->getName())) {
-            continue;
-        }
-        for (auto *cardNode : *zoneNode) {
-            auto *cardCardNode = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (cardCardNode) {
-                result.append(cardCardNode);
-            }
-        }
-    }
-
-    return result;
-}
-
-QList<const InnerDecklistNode *> DecklistNodeTree::getZoneNodes() const
-{
-    QList<const InnerDecklistNode *> zones;
-    for (auto *node : *root) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node);
-        if (!currentZone)
-            continue;
-        zones.append(currentZone);
-    }
-
-    return zones;
-}
-
-QString DecklistNodeTree::computeDeckHash() const
-{
-    auto mainDeckNodes = getCardNodes({DECK_ZONE_MAIN});
-    auto sideDeckNodes = getCardNodes({DECK_ZONE_SIDE});
-
-    static auto nodesToCardList = [](const QList<const DecklistCardNode *> &nodes, const QString &prefix = {}) {
-        QStringList result;
-        for (auto node : nodes) {
-            for (int i = 0; i < node->getNumber(); ++i) {
-                result.append(prefix + node->getName().toLower());
-            }
-        }
-        return result;
-    };
-
-    QStringList cardList = nodesToCardList(mainDeckNodes) + nodesToCardList(sideDeckNodes, "SB:");
-
-    cardList.sort();
-    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
-    quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
-                     (((quint64)(unsigned char)deckHashArray[1]) << 24) +
-                     (((quint64)(unsigned char)deckHashArray[2] << 16)) +
-                     (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4];
-    return QString::number(number, 32).rightJustified(8, '0');
-}
-
-void DecklistNodeTree::write(QXmlStreamWriter *xml) const
-{
-    for (int i = 0; i < root->size(); i++) {
-        root->at(i)->writeElement(xml);
-    }
-}
-
-void DecklistNodeTree::readZoneElement(QXmlStreamReader *xml)
-{
-    QString zoneName = xml->attributes().value("name").toString();
-    InnerDecklistNode *newZone = getZoneObjFromName(zoneName);
-    newZone->readElement(xml);
-}
-
-DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName,
-                                            int amount,
-                                            const QString &zoneName,
-                                            int position,
-                                            const QString &cardSetName,
-                                            const QString &cardSetCollectorNumber,
-                                            const QString &cardProviderId,
-                                            const bool formatLegal)
-{
-    auto *zoneNode = getZoneObjFromName(zoneName);
-    auto *node = new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber,
-                                      cardProviderId, formatLegal);
-    return node;
-}
-
-bool DecklistNodeTree::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
-{
-    if (node == root) {
-        return true;
-    }
-
-    if (rootNode == nullptr) {
-        rootNode = root;
-    }
-
-    int index = rootNode->indexOf(node);
-    if (index != -1) {
-        delete rootNode->takeAt(index);
-
-        if (rootNode->empty()) {
-            deleteNode(rootNode, rootNode->getParent());
-        }
-
-        return true;
-    }
-
-    for (int i = 0; i < rootNode->size(); i++) {
-        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
-        if (inner) {
-            if (deleteNode(node, inner)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void DecklistNodeTree::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
-{
-    // Support for this is only possible if the internal structure
-    // doesn't get more complicated.
-    for (int i = 0; i < root->size(); i++) {
-        InnerDecklistNode *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        for (int j = 0; j < node->size(); j++) {
-            DecklistCardNode *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-            func(node, card);
-        }
-    }
-}
-
-/**
- * Gets the InnerDecklistNode that is the root node for the given zone, creating a new node if it doesn't exist.
- */
-InnerDecklistNode *DecklistNodeTree::getZoneObjFromName(const QString &zoneName) const
-{
-    for (int i = 0; i < root->size(); i++) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        if (node->getName() == zoneName) {
-            return node;
-        }
-    }
-
-    return new InnerDecklistNode(zoneName, root);
-}

libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h

@@ -1,87 +0,0 @@
-#ifndef COCKATRICE_DECKLIST_NODE_TREE_H
-#define COCKATRICE_DECKLIST_NODE_TREE_H
-
-#include "libcockatrice/utility/card_ref.h"
-#include "tree/deck_list_card_node.h"
-#include "tree/inner_deck_list_node.h"
-
-#include <QSet>
-
-class DecklistNodeTree
-{
-    InnerDecklistNode *root; ///< Root of the deck tree (zones + cards).
-
-public:
-    /// @brief Constructs an empty DecklistNodeTree
-    explicit DecklistNodeTree();
-    /// @brief Copy constructor. Deep copies the tree
-    explicit DecklistNodeTree(const DecklistNodeTree &other);
-    /// @brief Copy-assignment operator. Deep copies the tree
-    DecklistNodeTree &operator=(const DecklistNodeTree &other);
-
-    virtual ~DecklistNodeTree();
-
-    /**
-     * @brief Gets a pointer to the underlying root node.
-     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
-     * For now, only the DeckListModel should be calling this.
-     */
-    InnerDecklistNode *getRoot() const
-    {
-        return root;
-    }
-
-    bool isEmpty() const;
-
-    /**
-     * @brief Deletes all nodes except the root.
-     */
-    void clear();
-
-    /**
-     * Gets all card nodes in the tree
-     * @param restrictToZones Only get the nodes in these zones
-     * @return A QList containing all the card nodes in the zone.
-     */
-    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
-
-    QList<const InnerDecklistNode *> getZoneNodes() const;
-
-    /**
-     * @brief Computes the deck hash
-     */
-    QString computeDeckHash() const;
-
-    /**
-     *@brief Writes the contents of the deck to xml
-     */
-    void write(QXmlStreamWriter *xml) const;
-
-    /**
-     * @brief Reads a "zone" section of the xml to this tree
-     */
-    void readZoneElement(QXmlStreamReader *xml);
-
-    DecklistCardNode *addCard(const QString &cardName,
-                              int amount,
-                              const QString &zoneName,
-                              int position,
-                              const QString &cardSetName = QString(),
-                              const QString &cardSetCollectorNumber = QString(),
-                              const QString &cardProviderId = QString(),
-                              const bool formatLegal = true);
-    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
-
-    /**
-     * @brief Apply a function to every card in the deck tree. This can modify the cards.
-     *
-     * @param func Function taking (zone node, card node).
-     */
-    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const;
-
-private:
-    // Helpers for traversing the tree
-    InnerDecklistNode *getZoneObjFromName(const QString &zoneName) const;
-};
-
-#endif // COCKATRICE_DECKLIST_NODE_TREE_H

libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h

@@ -88,12 +88,6 @@ public:
     /// @param _cardSetNumber Set the collector number.
     virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0;
 
-    /// @return The format legality of the card
-    virtual bool getFormatLegality() const = 0;
-
-    /// @param _formatLegal If the card is considered legal
-    virtual void setFormatLegality(const bool _formatLegal) = 0;
-
     /**
      * @brief Get the height of this node in the tree.
      *

libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h

@@ -51,7 +51,6 @@ class DecklistCardNode : public AbstractDecklistCardNode
     QString cardSetShortName; ///< Short set code (e.g., "NEO").
     QString cardSetNumber;    ///< Collector number within the set.
     QString cardProviderId;   ///< External provider identifier (e.g., UUID).
-    bool formatLegal;         ///< Format legality
 
 public:
     /**
@@ -64,7 +63,6 @@ public:
      * @param _cardSetShortName Short set code (e.g., "NEO").
      * @param _cardSetNumber Collector number within the set.
      * @param _cardProviderId External provider ID (e.g., UUID).
-     * @param _formatLegality If the card is legal in the format
      *
      * On construction, if a parent is provided, this node is inserted into
      * the parent’s children list automatically.
@@ -75,11 +73,10 @@ public:
                               int position = -1,
                               QString _cardSetShortName = QString(),
                               QString _cardSetNumber = QString(),
-                              QString _cardProviderId = QString(),
-                              bool _formatLegality = true)
+                              QString _cardProviderId = QString())
         : AbstractDecklistCardNode(_parent, position), name(std::move(_name)), number(_number),
           cardSetShortName(std::move(_cardSetShortName)), cardSetNumber(std::move(_cardSetNumber)),
-          cardProviderId(std::move(_cardProviderId)), formatLegal(_formatLegality)
+          cardProviderId(std::move(_cardProviderId))
     {
     }
 
@@ -153,18 +150,6 @@ public:
         cardSetNumber = _cardSetNumber;
     }
 
-    /// @return The format legality of the card
-    [[nodiscard]] bool getFormatLegality() const override
-    {
-        return formatLegal;
-    }
-
-    /// @param _formatLegal If the card is considered legal
-    void setFormatLegality(const bool _formatLegal) override
-    {
-        formatLegal = _formatLegal;
-    }
-
     /// @return Always false; card nodes are not deck headers.
     [[nodiscard]] bool isDeckHeader() const override
     {

libcockatrice_filters/libcockatrice/filters/filter_card.cpp

@@ -60,8 +60,6 @@ const QString CardFilter::attrName(Attr a)
     switch (a) {
         case AttrName:
             return tr("Name");
-        case AttrNameExact:
-            return tr("Name (Exact)");
         case AttrType:
             return tr("Type");
         case AttrColor:

libcockatrice_filters/libcockatrice/filters/filter_card.h

@@ -33,7 +33,6 @@ public:
         AttrLoyalty,
         AttrManaCost,
         AttrName,
-        AttrNameExact,
         AttrPow,
         AttrRarity,
         AttrSet,

libcockatrice_filters/libcockatrice/filters/filter_tree.cpp

@@ -153,11 +153,6 @@ bool FilterItem::acceptName(const CardInfoPtr info) const
     return info->getName().contains(term, Qt::CaseInsensitive);
 }
 
-bool FilterItem::acceptNameExact(const CardInfoPtr info) const
-{
-    return info->getName() == term;
-}
-
 bool FilterItem::acceptType(const CardInfoPtr info) const
 {
     return info->getCardType().contains(term, Qt::CaseInsensitive);
@@ -406,8 +401,6 @@ bool FilterItem::acceptCardAttr(const CardInfoPtr info, CardFilter::Attr attr) c
     switch (attr) {
         case CardFilter::AttrName:
             return acceptName(info);
-        case CardFilter::AttrNameExact:
-            return acceptNameExact(info);
         case CardFilter::AttrType:
             return acceptType(info);
         case CardFilter::AttrColor: