jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor: Represent cardName + providerId with CardRef struct (#6039)

Browse source 
* card_ref.h

* update CardDatabase signatures

* make everything compile

* rename methods

* add docs

* mark stuff const

* set cardRef in CardItem

* cleanup

* fix build failure

* Fix builds on mac

---------

Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
This commit is contained in:
RickyRister 2025-07-15 19:14:02 -07:00 • committed by GitHub
parent e05dad4267
commit a9b3be33e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
61 changed files with 328 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/decklist.h
View file

@ -1,6 +1,8 @@
#ifndef DECKLIST_H
#define DECKLIST_H
#include "card_ref.h"
#include <QMap>
#include <QVector>
@ -246,6 +248,10 @@ public:
{
return false;
}
CardRef toCardRef() const
{
return {name, cardProviderId};
}
};
class DeckList : public QObject
@ -253,13 +259,13 @@ class DeckList : public QObject
Q_OBJECT
private:
QString name, comments;
QPair<QString, QString> bannerCard;
CardRef bannerCard;
QString lastLoadedTimestamp;
QStringList tags;
QMap<QString, SideboardPlan *> sideboardPlans;
InnerDecklistNode *root;
void getCardListHelper(InnerDecklistNode *node, QSet<QString> &result) const;
void getCardListWithProviderIdHelper(InnerDecklistNode *item, QMap<QString, QString> &result) const;
static void getCardListHelper(InnerDecklistNode *node, QSet<QString> &result);
static void getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result);
InnerDecklistNode *getZoneObjFromName(const QString &zoneName);
/**
@ -305,7 +311,7 @@ public slots:
tags.clear();
emit deckTagsChanged();
}
void setBannerCard(const QPair<QString, QString> &_bannerCard = QPair<QString, QString>())
void setBannerCard(const CardRef &_bannerCard = {})
{
bannerCard = _bannerCard;
}
@ -331,7 +337,7 @@ public:
{
return tags;
}
QPair<QString, QString> getBannerCard() const
CardRef getBannerCard() const
{
return bannerCard;
}
@ -365,7 +371,7 @@ public:
return root->isEmpty() && name.isEmpty() && comments.isEmpty() && sideboardPlans.isEmpty();
}
QStringList getCardList() const;
QMap<QString, QString> getCardListWithProviderId() const;
QList<CardRef> getCardRefList() const;
int getSideboardSize() const;