jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 18:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[DeckLoader] Disable copy constructor (#6338)

Browse source 
Took 1 hour 19 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-11-19 12:16:39 +01:00 • committed by GitHub
parent 16392c28c5
commit 8788a7aada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/player/player.cpp
View file

@ -265,7 +265,7 @@ void Player::deleteCard(CardItem *card)
void Player::setDeck(const DeckLoader &_deck) void Player::setDeck(const DeckLoader &_deck)
{ {
deck = new DeckLoader(_deck); deck = new DeckLoader(this, _deck.getDeckList());
emit deckChanged(); emit deckChanged();
} }

6
cockatrice/src/interface/deck_loader/deck_loader.cpp
View file

@ -36,12 +36,6 @@ DeckLoader::DeckLoader(QObject *parent, DeckList *_deckList)
deckList->setParent(this); 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) void DeckLoader::setDeckList(DeckList *_deckList)
{ {
deckList = _deckList; deckList = _deckList;

7
cockatrice/src/interface/deck_loader/deck_loader.h
View file

@ -53,8 +53,11 @@ private:
public: public:
DeckLoader(QObject *parent); DeckLoader(QObject *parent);
DeckLoader(QObject *parent, DeckList *_deckList); DeckLoader(QObject *parent, DeckList *_deckList);
DeckLoader(const DeckLoader &) = delete;
DeckLoader &operator=(const DeckLoader &) = delete;
void setDeckList(DeckList *_deckList); void setDeckList(DeckList *_deckList);
DeckLoader(const DeckLoader &other);
const QString &getLastFileName() const const QString &getLastFileName() const
{ {
return lastFileName; return lastFileName;
@ -106,7 +109,7 @@ public:
bool convertToCockatriceFormat(QString fileName); bool convertToCockatriceFormat(QString fileName);
DeckList *getDeckList() DeckList *getDeckList() const
{ {
return deckList; return deckList;
} }

2
cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
View file

@ -142,7 +142,7 @@ DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckLoader &deckList, bool
{ {
setWindowTitle(tr("Edit deck in clipboard")); setWindowTitle(tr("Edit deck in clipboard"));
deckLoader = new DeckLoader(deckList); deckLoader = new DeckLoader(this, deckList.getDeckList());
deckLoader->setParent(this); deckLoader->setParent(this);
DlgEditDeckInClipboard::actRefresh(); DlgEditDeckInClipboard::actRefresh();