[Refactor] Pass around LoadedDeck instead of DeckLoader (#6422)

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -269,12 +269,12 @@ void DeckViewContainer::loadDeckFromFile(const QString &filePath)
         return;
     }
 
-    loadDeckFromDeckLoader(&deck);
+    loadDeckFromDeckList(deck.getDeck().deckList);
 }
 
-void DeckViewContainer::loadDeckFromDeckLoader(DeckLoader *deck)
+void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
 {
-    QString deckString = deck->getDeckList()->writeToString_Native();
+    QString deckString = deck.writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -308,8 +308,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeckList();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeckList();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -320,16 +320,15 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeck();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeck();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckLoader newDeck(this, new DeckList(QString::fromStdString(resp.deck())));
-    CardPictureLoader::cacheCardPixmaps(
-        CardDatabaseManager::query()->getCards(newDeck.getDeckList()->getCardRefList()));
+    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -410,8 +409,8 @@ void DeckViewContainer::setSideboardLocked(bool locked)
         deckView->resetSideboardPlan();
 }
 
-void DeckViewContainer::setDeck(DeckLoader &deck)
+void DeckViewContainer::setDeck(const DeckList &deck)
 {
-    deckView->setDeck(*deck.getDeckList());
+    deckView->setDeck(deck);
     switchToDeckLoadedView();
 }

cockatrice/src/game/deckview/deck_view_container.h

@@ -85,12 +85,12 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(DeckLoader &deck);
+    void setDeck(const DeckList &deck);
     void setVisualDeckStorageExists(bool exists);
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckLoader(DeckLoader *deck);
+    void loadDeckFromDeckList(const DeckList &deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H

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

@@ -60,13 +60,13 @@ void UtilityMenu::populatePredefinedTokensMenu()
     clear();
     setEnabled(false);
     predefinedTokens.clear();
-    DeckLoader *_deck = player->getDeck();
+    const DeckList &deckList = player->getDeck();
 
-    if (!_deck) {
+    if (deckList.isEmpty()) {
         return;
     }
 
-    auto tokenCardNodes = _deck->getDeckList()->getCardNodes({DECK_ZONE_TOKENS});
+    auto tokenCardNodes = deckList.getCardNodes({DECK_ZONE_TOKENS});
 
     if (!tokenCardNodes.isEmpty()) {
         setEnabled(true);

cockatrice/src/game/player/player.cpp

@@ -32,7 +32,7 @@
 Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
       playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
-      conceded(false), deck(nullptr), zoneId(0), dialogSemaphore(false)
+      conceded(false), zoneId(0), dialogSemaphore(false)
 {
     initializeZones();
 
@@ -263,10 +263,9 @@ void Player::deleteCard(CardItem *card)
     }
 }
 
-//! \todo Does a player need a DeckLoader?
-void Player::setDeck(DeckLoader &_deck)
+void Player::setDeck(const DeckList &_deck)
 {
-    deck = new DeckLoader(this, _deck.getDeckList());
+    deck = _deck;
 
     emit deckChanged();
 }

cockatrice/src/game/player/player.h

@@ -9,6 +9,7 @@
 
 #include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
+#include "../interface/deck_loader/loaded_deck.h"
 #include "../zones/logic/hand_zone_logic.h"
 #include "../zones/logic/pile_zone_logic.h"
 #include "../zones/logic/stack_zone_logic.h"
@@ -44,7 +45,6 @@ class ArrowTarget;
 class CardDatabase;
 class CardZone;
 class CommandContainer;
-class DeckLoader;
 class GameCommand;
 class GameEvent;
 class PlayerInfo;
@@ -66,7 +66,7 @@ class Player : public QObject
     Q_OBJECT
 
 signals:
-    void openDeckEditor(DeckLoader *deck);
+    void openDeckEditor(const LoadedDeck &deck);
     void deckChanged();
     void newCardAdded(AbstractCardItem *card);
     void rearrangeCounters();
@@ -130,9 +130,9 @@ public:
         return playerMenu;
     }
 
-    void setDeck(DeckLoader &_deck);
+    void setDeck(const DeckList &_deck);
 
-    [[nodiscard]] DeckLoader *getDeck() const
+    [[nodiscard]] const DeckList &getDeck() const
     {
         return deck;
     }
@@ -241,7 +241,7 @@ private:
     bool active;
     bool conceded;
 
-    DeckLoader *deck;
+    DeckList deck;
 
     int zoneId;
     QMap<QString, CardZoneLogic *> zones;

cockatrice/src/game/player/player_actions.cpp

@@ -218,7 +218,7 @@ void PlayerActions::actAlwaysLookAtTopCard()
 
 void PlayerActions::actOpenDeckInDeckEditor()
 {
-    emit player->openDeckEditor(player->getDeck());
+    emit player->openDeckEditor({.deckList = player->getDeck()});
 }
 
 void PlayerActions::actViewGraveyard()