jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

A DeckLoader is not a DeckList. (#6306)

Browse source 
* A DeckLoader is not a DeckList.

Took 2 hours 39 minutes

* Explicitly initialize base class in copy constructor?

Took 3 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-11-12 02:16:44 +01:00 • committed by GitHub
parent 4c431e98a6
commit 8e88749078
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 163 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
class DeckLoader : public DeckList
class DeckLoader : public QObject
{
Q_OBJECT
signals:
@ -52,14 +52,15 @@ public:
};
private:
DeckList *deckList;
QString lastFileName;
FileFormat lastFileFormat;
int lastRemoteDeckId;
public:
DeckLoader();
explicit DeckLoader(const QString &nativeString);
explicit DeckLoader(const DeckList &other);
DeckLoader(QObject *parent);
DeckLoader(QObject *parent, DeckList *_deckList);
void setDeckList(DeckList *_deckList);
DeckLoader(const DeckLoader &other);
const QString &getLastFileName() const
{
@ -102,6 +103,11 @@ public:
bool saveToStream_Plain(QTextStream &out, bool addComments = true, bool addSetNameAndNumber = true) const;
bool convertToCockatriceFormat(QString fileName);
DeckList *getDeckList()
{
return deckList;
}
private:
void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
@ -116,8 +122,8 @@ protected:
QList<DecklistCardNode *> cards,
bool addComments = true,
bool addSetNameAndNumber = true) const;
[[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName) override;
[[nodiscard]] QString getCompleteCardName(const QString &cardName) const override;
[[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName);
[[nodiscard]] QString getCompleteCardName(const QString &cardName) const;
};
#endif