From 8788a7aada33c8705043a44b7cdbf2b1ce8034cc Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Wed, 19 Nov 2025 12:16:39 +0100 Subject: [PATCH] [DeckLoader] Disable copy constructor (#6338) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 1 hour 19 minutes Co-authored-by: Lukas Brübach --- cockatrice/src/game/player/player.cpp | 2 +- cockatrice/src/interface/deck_loader/deck_loader.cpp | 6 ------ cockatrice/src/interface/deck_loader/deck_loader.h | 7 +++++-- .../widgets/dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 300300de3..1ff2eb381 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -265,7 +265,7 @@ void Player::deleteCard(CardItem *card) void Player::setDeck(const DeckLoader &_deck) { - deck = new DeckLoader(_deck); + deck = new DeckLoader(this, _deck.getDeckList()); emit deckChanged(); } diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index ebc951c6e..3d739cade 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -36,12 +36,6 @@ DeckLoader::DeckLoader(QObject *parent, DeckList *_deckList) deckList->setParent(this); } -DeckLoader::DeckLoader(const DeckLoader &other) - : QObject(), deckList(other.deckList), lastFileName(other.lastFileName), lastFileFormat(other.lastFileFormat), - lastRemoteDeckId(other.lastRemoteDeckId) -{ -} - void DeckLoader::setDeckList(DeckList *_deckList) { deckList = _deckList; diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index a83542ce9..be4601cd3 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -53,8 +53,11 @@ private: public: DeckLoader(QObject *parent); DeckLoader(QObject *parent, DeckList *_deckList); + DeckLoader(const DeckLoader &) = delete; + DeckLoader &operator=(const DeckLoader &) = delete; + void setDeckList(DeckList *_deckList); - DeckLoader(const DeckLoader &other); + const QString &getLastFileName() const { return lastFileName; @@ -106,7 +109,7 @@ public: bool convertToCockatriceFormat(QString fileName); - DeckList *getDeckList() + DeckList *getDeckList() const { return deckList; } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp index 3385dd41e..6ba05f0b0 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp @@ -142,7 +142,7 @@ DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckLoader &deckList, bool { setWindowTitle(tr("Edit deck in clipboard")); - deckLoader = new DeckLoader(deckList); + deckLoader = new DeckLoader(this, deckList.getDeckList()); deckLoader->setParent(this); DlgEditDeckInClipboard::actRefresh();