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

Inline getCardFromMap

Browse source 
map.value already returns a default-constructed value if the key is not present
This commit is contained in:
RickyRister 2025-07-12 01:14:41 -07:00
parent 4fbb47300e
commit 130c4f0b2e
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,14 +113,14 @@ void CardDatabase::removeCard(CardInfoPtr card)
CardInfoPtr CardDatabase::getCard(const QString &cardName) const CardInfoPtr CardDatabase::getCard(const QString &cardName) const
{ {
return getCardFromMap(cards, cardName); return cards.value(cardName);
} }
QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const
{ {
QList<CardInfoPtr> cardInfos; QList<CardInfoPtr> cardInfos;
for (const QString &cardName : cardNames) { for (const QString &cardName : cardNames) {
CardInfoPtr ptr = getCardFromMap(cards, cardName); CardInfoPtr ptr = cards.value(cardName);
if (ptr) if (ptr)
cardInfos.append(ptr); cardInfos.append(ptr);
} }
@ -162,7 +162,7 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co
CardInfoPtr CardDatabase::getCardBySimpleName(const QString &cardName) const CardInfoPtr CardDatabase::getCardBySimpleName(const QString &cardName) const
{ {
return getCardFromMap(simpleNameCards, CardInfo::simplifyName(cardName)); return simpleNameCards.value(CardInfo::simplifyName(cardName));
} }
CardInfoPtr CardDatabase::guessCard(const QString &cardName, const QString &providerId) const CardInfoPtr CardDatabase::guessCard(const QString &cardName, const QString &providerId) const
@ -206,14 +206,6 @@ SetList CardDatabase::getSetList() const
return result; return result;
} }
CardInfoPtr CardDatabase::getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const
{
if (cardMap.contains(cardName))
return cardMap.value(cardName);
return {};
}
LoadStatus CardDatabase::loadFromFile(const QString &fileName) LoadStatus CardDatabase::loadFromFile(const QString &fileName)
{ {
QFile file(fileName); QFile file(fileName);

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

@ -52,7 +52,6 @@ protected:
QVector<ICardDatabaseParser *> availableParsers; QVector<ICardDatabaseParser *> availableParsers;
private: private:
CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const;
void checkUnknownSets(); void checkUnknownSets();
void refreshCachedReverseRelatedCards(); void refreshCachedReverseRelatedCards();