mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2025-12-20 14:22:37 -08:00
Introduce null checks, add setShortName and collectorNumber to deckList export. (#5471)
* Introduce null checks, add setShortName and collectorNumber to deckList export. * Lint. * Lint again. * Lint AGAIN. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
@@ -254,6 +254,14 @@ struct FormatDeckListForExport
|
||||
mainBoardCards += QString::number(card->getNumber());
|
||||
mainBoardCards += "%20";
|
||||
mainBoardCards += card->getName();
|
||||
if (!card->getCardSetShortName().isNull()) {
|
||||
mainBoardCards += "%20";
|
||||
mainBoardCards += "(" + card->getCardSetShortName() + ")";
|
||||
}
|
||||
if (!card->getCardCollectorNumber().isNull()) {
|
||||
mainBoardCards += "%20";
|
||||
mainBoardCards += card->getCardCollectorNumber();
|
||||
}
|
||||
mainBoardCards += "%0A";
|
||||
}
|
||||
}
|
||||
@@ -419,7 +427,20 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
|
||||
out << "SB: ";
|
||||
}
|
||||
|
||||
out << card->getNumber() << " " << card->getName() << "\n";
|
||||
if (card->getNumber()) {
|
||||
out << card->getNumber();
|
||||
}
|
||||
if (!card->getName().isNull() && !card->getName().isEmpty()) {
|
||||
out << " " << card->getName();
|
||||
}
|
||||
if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
|
||||
out << " "
|
||||
<< "(" << card->getCardSetShortName() << ")";
|
||||
}
|
||||
if (!card->getCardCollectorNumber().isNull()) {
|
||||
out << " " << card->getCardCollectorNumber();
|
||||
}
|
||||
out << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user