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

Minor cleanup

Browse source
This commit is contained in:
ZeldaZach 2024-12-01 11:53:46 -05:00
parent 322d61e7ef
commit 4a75eac3d3
No known key found for this signature in database
9 changed files with 37 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/client/ui/picture_loader.cpp
View file

@ -32,8 +32,8 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card)
: card(std::move(_card)), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) : card(std::move(_card)), urlTemplates(SettingsCache::instance().downloads().getAllURLs())
{ {
if (card) { if (card) {
for (const auto &x : card->getSets()) { for (const auto &cardInfoPerSetList : card->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
sortedSets << set.getPtr(); sortedSets << set.getPtr();
} }
} }
@ -45,8 +45,8 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card)
// If the user hasn't disabled arts other than their personal preference... // If the user hasn't disabled arts other than their personal preference...
if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
// If the pixmapCacheKey corresponds to a specific set, we have to try to load it first. // If the pixmapCacheKey corresponds to a specific set, we have to try to load it first.
for (const auto &x : card->getSets()) { for (const auto &cardInfoPerSetList : card->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) == if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) ==
card->getPixmapCacheKey()) { card->getPixmapCacheKey()) {
long long setIndex = sortedSets.indexOf(set.getPtr()); long long setIndex = sortedSets.indexOf(set.getPtr());

4
cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
View file

@ -116,8 +116,8 @@ CardInfoPerSet PrintingSelector::getSetForUUID(const QString &uuid)
{ {
CardInfoPerSetMap cardInfoPerSets = selectedCard->getSets(); CardInfoPerSetMap cardInfoPerSets = selectedCard->getSets();
for (const auto &x : cardInfoPerSets) { for (const auto &cardInfoPerSetList : cardInfoPerSets) {
for (const auto &cardInfoPerSet : x) { for (const auto &cardInfoPerSet : cardInfoPerSetList) {
if (cardInfoPerSet.getProperty("uuid") == uuid) { if (cardInfoPerSet.getProperty("uuid") == uuid) {
return cardInfoPerSet; return cardInfoPerSet;
} }

12
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -44,8 +44,8 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet
{ {
QList<CardSetPtr> sortedSets; QList<CardSetPtr> sortedSets;
for (const auto &x : cardInfoPerSets) { for (const auto &cardInfoPerSetList : cardInfoPerSets) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
sortedSets << set.getPtr(); sortedSets << set.getPtr();
break; break;
} }
@ -66,8 +66,8 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet
// Reconstruct sorted list of CardInfoPerSet // Reconstruct sorted list of CardInfoPerSet
for (const auto &set : sortedSets) { for (const auto &set : sortedSets) {
for (auto it = cardInfoPerSets.begin(); it != cardInfoPerSets.end(); ++it) { for (auto it = cardInfoPerSets.begin(); it != cardInfoPerSets.end(); ++it) {
for (const auto &x : it.value()) { for (const auto &cardInfoPerSet : it.value()) {
if (x.getPtr() == set) { if (cardInfoPerSet.getPtr() == set) {
sortedCardInfoPerSets << it.value(); sortedCardInfoPerSets << it.value();
break; break;
} }
@ -115,8 +115,8 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::prependPrintingsInDeck(
QList<QPair<CardInfoPerSet, int>> countList; QList<QPair<CardInfoPerSet, int>> countList;
// Collect sets with their counts // Collect sets with their counts
for (const auto &x : cardInfoPerSets) { for (const auto &cardInfoPerSetList : cardInfoPerSets) {
for (const auto &cardInfoPerSet : x) { for (const auto &cardInfoPerSet : cardInfoPerSetList) {
QModelIndex find_card = QModelIndex find_card =
deckModel->findCard(selectedCard->getName(), DECK_ZONE_MAIN, cardInfoPerSet.getProperty("uuid")); deckModel->findCard(selectedCard->getName(), DECK_ZONE_MAIN, cardInfoPerSet.getProperty("uuid"));
if (find_card.isValid()) { if (find_card.isValid()) {

28
cockatrice/src/game/cards/card_database.cpp
View file

@ -266,8 +266,8 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
_sets, _cipt, _tableRow, _upsideDownArt)); _sets, _cipt, _tableRow, _upsideDownArt));
ptr->setSmartPointer(ptr); ptr->setSmartPointer(ptr);
for (const auto &x : _sets) { for (const auto &cardInfoPerSetList : _sets) {
for (const CardInfoPerSet &set : x) { for (const CardInfoPerSet &set : cardInfoPerSetList) {
set.getPtr()->append(ptr); set.getPtr()->append(ptr);
break; break;
} }
@ -300,8 +300,8 @@ void CardInfo::refreshCachedSetNames()
{ {
QStringList setList; QStringList setList;
// update the cached list of set names // update the cached list of set names
for (const auto &x : sets) { for (const auto &cardInfoPerSetList : sets) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getEnabled()) { if (set.getPtr()->getEnabled()) {
setList << set.getPtr()->getShortName(); setList << set.getPtr()->getShortName();
} }
@ -402,8 +402,8 @@ void CardDatabase::addCard(CardInfoPtr card)
// if card already exists just add the new set property // if card already exists just add the new set property
if (cards.contains(card->getName())) { if (cards.contains(card->getName())) {
CardInfoPtr sameCard = cards[card->getName()]; CardInfoPtr sameCard = cards[card->getName()];
for (const auto &x : card->getSets()) { for (const auto &cardInfoPerSetList : card->getSets()) {
for (const CardInfoPerSet &set : x) { for (const CardInfoPerSet &set : cardInfoPerSetList) {
sameCard->addToSet(set.getPtr(), set); sameCard->addToSet(set.getPtr(), set);
} }
} }
@ -464,8 +464,8 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co
return info; return info;
} }
for (const auto &x : info->getSets()) { for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (set.getProperty("uuid") == providerId) { if (set.getProperty("uuid") == providerId) {
CardInfoPtr cardFromSpecificSet = info->clone(); CardInfoPtr cardFromSpecificSet = info->clone();
cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) + cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) +
@ -640,8 +640,8 @@ CardInfoPerSet CardDatabase::getPreferredSetForCard(const QString &cardName) con
CardInfoPerSet preferredCard; CardInfoPerSet preferredCard;
SetPriorityComparator comparator; SetPriorityComparator comparator;
for (const auto &x : setMap) { for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : x) { for (auto &cardInfoForSet : cardInfoPerSetList) {
CardSetPtr currentSet = cardInfoForSet.getPtr(); CardSetPtr currentSet = cardInfoForSet.getPtr();
if (!preferredSet || comparator(currentSet, preferredSet)) { if (!preferredSet || comparator(currentSet, preferredSet)) {
preferredSet = currentSet; preferredSet = currentSet;
@ -669,8 +669,8 @@ CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName, cons
return CardInfoPerSet(nullptr); return CardInfoPerSet(nullptr);
} }
for (const auto &x : setMap) { for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : x) { for (auto &cardInfoForSet : cardInfoPerSetList) {
if (cardInfoForSet.getProperty("uuid") == providerId) { if (cardInfoForSet.getProperty("uuid") == providerId) {
return cardInfoForSet; return cardInfoForSet;
} }
@ -714,8 +714,8 @@ CardInfoPerSet CardDatabase::getSetInfoForCard(const CardInfoPtr &_card)
return CardInfoPerSet(nullptr); return CardInfoPerSet(nullptr);
} }
for (const auto &x : setMap) { for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : x) { for (const auto &cardInfoForSet : cardInfoPerSetList) {
if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") == if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") ==
_card->getPixmapCacheKey()) { _card->getPixmapCacheKey()) {
return cardInfoForSet; return cardInfoForSet;

13
cockatrice/src/game/cards/card_database.h
View file

@ -307,19 +307,6 @@ public:
if (!sets.contains(setName)) if (!sets.contains(setName))
return ""; return "";
/*
for (const auto &x : card->getSets()) {
for (const auto &set : x) {
if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) ==
card->getPixmapCacheKey()) {
long long setIndex = sortedSets.indexOf(set.getPtr());
CardSetPtr setForCardProviderID = sortedSets.takeAt(setIndex);
sortedSets.prepend(setForCardProviderID);
}
}
}
*/
for (const auto &set : sets[setName]) { for (const auto &set : sets[setName]) {
if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) == if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) ==
this->getPixmapCacheKey()) { this->getPixmapCacheKey()) {

4
cockatrice/src/game/cards/card_database_model.cpp
View file

@ -97,8 +97,8 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
if (!showOnlyCardsFromEnabledSets) if (!showOnlyCardsFromEnabledSets)
return true; return true;
for (const auto &x : card->getSets()) { for (const auto &cardInfoPerSetList : card->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getEnabled()) if (set.getPtr()->getEnabled())
return true; return true;
} }

4
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
View file

@ -331,8 +331,8 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
// sets // sets
const CardInfoPerSetMap sets = info->getSets(); const CardInfoPerSetMap sets = info->getSets();
for (const auto &x : sets) { for (const auto &cardInfoPerSetList : sets) {
for (CardInfoPerSet set : x) { for (const CardInfoPerSet& set : cardInfoPerSetList) {
xml.writeStartElement("set"); xml.writeStartElement("set");
xml.writeAttribute("rarity", set.getProperty("rarity")); xml.writeAttribute("rarity", set.getProperty("rarity"));
xml.writeAttribute("muId", set.getProperty("muid")); xml.writeAttribute("muId", set.getProperty("muid"));

6
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
View file

@ -284,10 +284,10 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
xml.writeEndElement(); xml.writeEndElement();
// sets // sets
for (const auto &x : info->getSets()) { for (const auto &cardInfoPerSetList : info->getSets()) {
for (CardInfoPerSet set : x) { for (const CardInfoPerSet &set : cardInfoPerSetList) {
xml.writeStartElement("set"); xml.writeStartElement("set");
for (QString propName : set.getProperties()) { for (const QString& propName : set.getProperties()) {
xml.writeAttribute(propName, set.getProperty(propName)); xml.writeAttribute(propName, set.getProperty(propName));
} }

8
cockatrice/src/game/filters/filter_tree.cpp
View file

@ -203,8 +203,8 @@ bool FilterItem::acceptText(const CardInfoPtr info) const
bool FilterItem::acceptSet(const CardInfoPtr info) const bool FilterItem::acceptSet(const CardInfoPtr info) const
{ {
bool status = false; bool status = false;
for (const auto &x : info->getSets()) { for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getShortName().compare(term, Qt::CaseInsensitive) == 0 || if (set.getPtr()->getShortName().compare(term, Qt::CaseInsensitive) == 0 ||
set.getPtr()->getLongName().compare(term, Qt::CaseInsensitive) == 0) { set.getPtr()->getLongName().compare(term, Qt::CaseInsensitive) == 0) {
status = true; status = true;
@ -338,8 +338,8 @@ bool FilterItem::acceptRarity(const CardInfoPtr info) const
} }
} }
for (const auto &x : info->getSets()) { for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : x) { for (const auto &set : cardInfoPerSetList) {
if (set.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) { if (set.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) {
return true; return true;
} }