diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 60f464c10..a9eea724d 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -113,14 +113,14 @@ void CardDatabase::removeCard(CardInfoPtr card) CardInfoPtr CardDatabase::getCard(const QString &cardName) const { - return getCardFromMap(cards, cardName); + return cards.value(cardName); } QList CardDatabase::getCards(const QStringList &cardNames) const { QList cardInfos; for (const QString &cardName : cardNames) { - CardInfoPtr ptr = getCardFromMap(cards, cardName); + CardInfoPtr ptr = cards.value(cardName); if (ptr) cardInfos.append(ptr); } @@ -162,7 +162,7 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co 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 @@ -206,14 +206,6 @@ SetList CardDatabase::getSetList() const 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) { QFile file(fileName); diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index 8bd3d14e0..849ba00dd 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -52,7 +52,6 @@ protected: QVector availableParsers; private: - CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const; void checkUnknownSets(); void refreshCachedReverseRelatedCards();