jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 23:12:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: Add PrintingInfo::getUuid (#6046)

Browse source
This commit is contained in:
RickyRister 2025-07-17 06:06:34 -07:00 • committed by GitHub
parent 4fd2f1f974
commit ae47ee802b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/deck/deck_list_model.cpp
View file

@ -375,7 +375,7 @@ QModelIndex DeckListModel::addCard(const QString &cardName,
const QString &zoneName,
bool abAddAnyway)
{
CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard({cardName, printingInfo.getProperty("uuid")});
CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard({cardName, printingInfo.getUuid()});
if (cardInfo == nullptr) {
if (abAddAnyway) {
@ -396,7 +396,7 @@ QModelIndex DeckListModel::addCard(const QString &cardName,
const QModelIndex parentIndex = nodeToIndex(groupNode);
auto *cardNode = dynamic_cast<DecklistModelCardNode *>(groupNode->findCardChildByNameProviderIdAndNumber(
cardName, printingInfo.getProperty("uuid"), printingInfo.getProperty("num")));
cardName, printingInfo.getUuid(), printingInfo.getProperty("num")));
const auto cardSetName = printingInfo.getSet().isNull() ? "" : printingInfo.getSet()->getCorrectedShortName();
if (!cardNode) {

4
cockatrice/src/deck/deck_loader.cpp
View file

@ -325,7 +325,7 @@ struct SetProviderIdToPreferred
{
Q_UNUSED(node);
PrintingInfo preferredPrinting = CardDatabaseManager::getInstance()->getPreferredPrinting(card->getName());
QString providerId = preferredPrinting.getProperty("uuid");
QString providerId = preferredPrinting.getUuid();
QString setShortName = preferredPrinting.getSet()->getShortName();
QString collectorNumber = preferredPrinting.getProperty("num");
@ -359,7 +359,7 @@ void DeckLoader::resolveSetNameAndNumberToProviderID()
QString providerId =
CardDatabaseManager::getInstance()
->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
.getProperty("uuid");
.getUuid();
// Set the providerId on the card
card->setCardProviderId(providerId);