From 5bbfad46afc401738f662a3b3962d823576c58f0 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sat, 12 Jul 2025 04:42:38 -0700 Subject: [PATCH] rename methods --- .../client/tabs/abstract_tab_deck_editor.cpp | 3 +- ...ponse_commander_details_display_widget.cpp | 2 +- .../tabs/api/edhrec/tab_edhrec_main.cpp | 2 +- cockatrice/src/client/tabs/tab_game.cpp | 4 +-- .../src/client/tapped_out_interface.cpp | 2 +- .../card_group_display_widget.cpp | 2 +- .../flat_card_group_display_widget.cpp | 2 +- .../widgets/cards/card_info_frame_widget.cpp | 4 +-- .../cards/card_info_picture_widget.cpp | 4 +-- .../deck_analytics/mana_base_widget.cpp | 2 +- .../deck_analytics/mana_curve_widget.cpp | 2 +- .../deck_analytics/mana_devotion_widget.cpp | 2 +- .../deck_editor_database_display_widget.cpp | 8 ++--- .../deck_editor_deck_dock_widget.cpp | 6 ++-- .../printing_selector_card_overlay_widget.cpp | 5 ++- .../visual_database_display_widget.cpp | 8 ++--- .../visual_deck_editor_sample_hand_widget.cpp | 3 +- .../visual_deck_editor_widget.cpp | 4 +-- .../deck_preview/deck_preview_widget.cpp | 6 ++-- cockatrice/src/deck/deck_list_model.cpp | 13 +++---- cockatrice/src/deck/deck_loader.cpp | 6 ++-- cockatrice/src/deck/deck_stats_interface.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_tokens.cpp | 2 +- .../src/dialogs/dlg_select_set_for_cards.cpp | 12 +++---- .../src/game/board/abstract_card_item.cpp | 2 +- cockatrice/src/game/cards/card_database.cpp | 34 +++++++++---------- cockatrice/src/game/cards/card_database.h | 13 +++---- .../src/game/deckview/deck_view_container.cpp | 3 +- .../src/game/filters/deck_filter_string.cpp | 2 +- cockatrice/src/game/player/player.cpp | 18 +++++----- 30 files changed, 85 insertions(+), 93 deletions(-) diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index e04207160..850bff86d 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -161,8 +161,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck) void AbstractTabDeckEditor::setDeck(DeckLoader *_deck) { deckDockWidget->setDeck(_deck); - PictureLoader::cacheCardPixmaps( - CardDatabaseManager::getInstance()->getCardsByNameAndProviderId(getDeckList()->getCardRefList())); + PictureLoader::cacheCardPixmaps(CardDatabaseManager::getInstance()->getCards(getDeckList()->getCardRefList())); setModified(false); // If they load a deck, make the deck list appear diff --git a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index 2001cf6d1..6dbb25ac6 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -15,7 +15,7 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom setLayout(layout); commanderPicture = new CardInfoPictureWidget(this); - commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName())); + commanderPicture->setCard(CardDatabaseManager::getInstance()->getCardInfo(commanderDetails.getName())); QWidget *currentParent = parentWidget(); TabEdhRecMain *parentTab = nullptr; diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp index 2eed749af..1b1e90acb 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp @@ -136,7 +136,7 @@ void TabEdhRecMain::retranslateUi() void TabEdhRecMain::doSearch() { - CardInfoPtr searchedCard = CardDatabaseManager::getInstance()->getCard(searchBar->text()); + CardInfoPtr searchedCard = CardDatabaseManager::getInstance()->getCardInfo(searchBar->text()); if (!searchedCard) { return; } diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index d31cf6af6..43cab8e8a 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -929,8 +929,8 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event, DeckViewContainer *deckViewContainer = deckViewContainers.value(playerId); if (playerInfo.has_deck_list()) { DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list())); - PictureLoader::cacheCardPixmaps(CardDatabaseManager::getInstance()->getCardsByNameAndProviderId( - newDeck.getCardRefList())); + PictureLoader::cacheCardPixmaps( + CardDatabaseManager::getInstance()->getCards(newDeck.getCardRefList())); deckViewContainer->setDeck(newDeck); player->setDeck(newDeck); } diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index 05d163970..9b9a239d4 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -95,7 +95,7 @@ void TappedOutInterface::analyzeDeck(DeckList *deck) void TappedOutInterface::copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard) { auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) { - CardInfoPtr dbCard = cardDatabase.getCard(card->getName()); + CardInfoPtr dbCard = cardDatabase.getCardInfo(card->getName()); if (!dbCard || dbCard->getIsToken()) return; diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index e6b75b746..d260c391d 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -46,7 +46,7 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(int rowIndex) auto widget = new CardInfoPictureWithTextOverlayWidget(getLayoutParent(), true); widget->setScaleFactor(cardSizeWidget->getSlider()->value()); - widget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, cardProviderId})); + widget->setCard(CardDatabaseManager::getInstance()->getCard({cardName, cardProviderId})); connect(widget, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &CardGroupDisplayWidget::onClick); connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover); diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 1429214b3..615e0fcbf 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -89,7 +89,7 @@ QWidget *FlatCardGroupDisplayWidget::constructWidgetForIndex(int row) auto widget = new CardInfoPictureWithTextOverlayWidget(flowWidget, true); widget->setScaleFactor(cardSizeWidget->getSlider()->value()); - widget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, cardProviderId})); + widget->setCard(CardDatabaseManager::getInstance()->getCard({cardName, cardProviderId})); connect(widget, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &FlatCardGroupDisplayWidget::onClick); connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &FlatCardGroupDisplayWidget::onHover); diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp index 0abc51070..23a6fda46 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp @@ -62,7 +62,7 @@ CardInfoFrameWidget::CardInfoFrameWidget(const QString &cardName, QWidget *paren setViewMode(SettingsCache::instance().getCardInfoViewMode()); // TODO: Change this to be by UUID - setCard(CardDatabaseManager::getInstance()->getCard(cardName)); + setCard(CardDatabaseManager::getInstance()->getCardInfo(cardName)); } void CardInfoFrameWidget::retranslateUi() @@ -171,7 +171,7 @@ void CardInfoFrameWidget::setCard(const QString &cardName) void CardInfoFrameWidget::setCard(const CardRef &cardRef) { - setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId(cardRef)); + setCard(CardDatabaseManager::getInstance()->getCard(cardRef)); } void CardInfoFrameWidget::setCard(AbstractCardItem *card) diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp index 5e275f8e9..dcd42d581 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp @@ -374,7 +374,7 @@ QMenu *CardInfoPictureWidget::createViewRelatedCardsMenu() QList relatedCards = info->getAllRelatedCards(); auto relatedCardExists = [](const CardRelation *cardRelation) { - return CardDatabaseManager::getInstance()->getCard(cardRelation->getName()) != nullptr; + return CardDatabaseManager::getInstance()->getCardInfo(cardRelation->getName()) != nullptr; }; bool atLeastOneGoodRelationFound = std::any_of(relatedCards.begin(), relatedCards.end(), relatedCardExists); @@ -388,7 +388,7 @@ QMenu *CardInfoPictureWidget::createViewRelatedCardsMenu() const auto &relatedCardName = relatedCard->getName(); QAction *viewCard = viewRelatedCards->addAction(relatedCardName); connect(viewCard, &QAction::triggered, this, [this, &relatedCardName] { - emit cardChanged(CardDatabaseManager::getInstance()->getCard(relatedCardName)); + emit cardChanged(CardDatabaseManager::getInstance()->getCardInfo(relatedCardName)); }); viewRelatedCards->addAction(viewCard); } diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp index 895e2d64d..98e56df66 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp @@ -87,7 +87,7 @@ QHash ManaBaseWidget::analyzeManaBase() continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); if (info) { auto devotion = determineManaProduction(info->getText()); mergeManaCounts(manaBaseMap, devotion); diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp index 1cef0d794..0831ad655 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp @@ -53,7 +53,7 @@ std::unordered_map ManaCurveWidget::analyzeManaCurve() continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); if (info) { int cmc = info->getCmc().toInt(); manaCurveMap[cmc]++; diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp index 50b241a2a..485afc475 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp @@ -55,7 +55,7 @@ std::unordered_map ManaDevotionWidget::analyzeManaDevotion() continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); if (info) { auto devotion = countManaSymbols(info->getManaCost()); mergeManaCounts(manaDevotionMap, devotion); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp index 0eae82a6a..ee5750ca6 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -136,16 +136,16 @@ void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters() void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/) { const QString cardName = current.sibling(current.row(), 0).data().toString(); - const QString cardProviderID = CardDatabaseManager::getInstance()->getPreferredPrintingProviderIdForCard(cardName); + const QString cardProviderID = CardDatabaseManager::getInstance()->getPreferredPrintingProviderId(cardName); if (!current.isValid()) { return; } if (!current.model()->hasChildren(current.sibling(current.row(), 0))) { - CardInfoPtr card = CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, cardProviderID}); + CardInfoPtr card = CardDatabaseManager::getInstance()->getCard({cardName, cardProviderID}); if (!card) { - card = CardDatabaseManager::getInstance()->getCard(cardName); + card = CardDatabaseManager::getInstance()->getCardInfo(cardName); } emit cardChanged(card); } @@ -180,7 +180,7 @@ CardInfoPtr DeckEditorDatabaseDisplayWidget::currentCardInfo() const const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString(); - return CardDatabaseManager::getInstance()->getCard(cardName); + return CardDatabaseManager::getInstance()->getCardInfo(cardName); } void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point) diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 496e192ad..786c9b8df 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -227,8 +227,7 @@ CardInfoPtr DeckEditorDeckDockWidget::getCurrentCard() if (!current.model()->hasChildren(current.sibling(current.row(), 0))) { QString cardName = current.sibling(current.row(), 1).data().toString(); QString providerId = current.sibling(current.row(), 4).data().toString(); - if (CardInfoPtr selectedCard = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, providerId})) { + if (CardInfoPtr selectedCard = CardDatabaseManager::getInstance()->getCard({cardName, providerId})) { return selectedCard; } } @@ -287,8 +286,7 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox() continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId(currentCard->toCardRef()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->toCardRef()); if (info) { bannerCardSet.insert({currentCard->getName(), currentCard->getCardProviderId()}); } diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 7493d7c79..06cd89384 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -44,8 +44,7 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa cardInfoPicture = new CardInfoPictureWidget(this); cardInfoPicture->setMinimumSize(0, 0); cardInfoPicture->setScaleFactor(cardSizeSlider->value()); - setCard = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - {rootCard->getName(), _printingInfo.getProperty("uuid")}); + setCard = CardDatabaseManager::getInstance()->getCard({rootCard->getName(), _printingInfo.getProperty("uuid")}); cardInfoPicture->setCard(setCard); mainLayout->addWidget(cardInfoPicture); @@ -199,7 +198,7 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point) const QString &relatedCardName = rel->getName(); QAction *relatedCard = relatedMenu->addAction(relatedCardName); connect(relatedCard, &QAction::triggered, deckEditor, [this, relatedCardName] { - deckEditor->updateCard(CardDatabaseManager::getInstance()->getCard(relatedCardName)); + deckEditor->updateCard(CardDatabaseManager::getInstance()->getCardInfo(relatedCardName)); deckEditor->showPrintingSelector(); }); } diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index 87315c426..72daf8a30 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -228,12 +228,12 @@ void VisualDatabaseDisplayWidget::populateCards() QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); qCDebug(VisualDatabaseDisplayLog) << name.toString(); - if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { + if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(name.toString())) { if (setFilter) { SetToPrintingsMap setMap = info->getSets(); if (setMap.contains(setFilter->term())) { for (PrintingInfo printing : setMap[setFilter->term()]) { - addCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId( + addCard(CardDatabaseManager::getInstance()->getCard( {name.toString(), printing.getProperty("uuid")})); } } @@ -294,12 +294,12 @@ void VisualDatabaseDisplayWidget::loadNextPage() for (int row = start; row < end; ++row) { QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); - if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { + if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(name.toString())) { if (setFilter) { SetToPrintingsMap setMap = info->getSets(); if (setMap.contains(setFilter->term())) { for (PrintingInfo printing : setMap[setFilter->term()]) { - addCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId( + addCard(CardDatabaseManager::getInstance()->getCard( {name.toString(), printing.getProperty("uuid")})); } } diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index 28c613f56..efa755a11 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -101,8 +101,7 @@ QList VisualDeckEditorSampleHandWidget::getRandomCards(int amountTo continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId(currentCard->toCardRef()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->toCardRef()); if (info) { mainDeckCards.append(info); } diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index d58baacad..8cfb02f0f 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -42,7 +42,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_ if (!searchBar->hasFocus()) return; - CardInfoPtr card = CardDatabaseManager::getInstance()->getCard(searchBar->text()); + CardInfoPtr card = CardDatabaseManager::getInstance()->getCardInfo(searchBar->text()); if (card) { emit cardAdditionRequested(card); } @@ -103,7 +103,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_ // Search button functionality searchPushButton = new QPushButton(this); connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { - CardInfoPtr card = CardDatabaseManager::getInstance()->getCard(searchBar->text()); + CardInfoPtr card = CardDatabaseManager::getInstance()->getCardInfo(searchBar->text()); if (card) { emit cardAdditionRequested(card); } diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 18d35643d..f9e4f0c85 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -76,7 +76,7 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess) } auto bannerCard = deckLoader->getBannerCard().name.isEmpty() ? CardInfoPtr() - : CardDatabaseManager::getInstance()->getCardByNameAndProviderId(deckLoader->getBannerCard()); + : CardDatabaseManager::getInstance()->getCard(deckLoader->getBannerCard()); bannerCardDisplayWidget->setCard(bannerCard); bannerCardDisplayWidget->setFontSize(24); @@ -160,7 +160,7 @@ QString DeckPreviewWidget::getColorIdentity() QSet colorSet; // A set to collect unique color symbols (e.g., W, U, B, R, G) for (const QString &cardName : cardList) { - CardInfoPtr currentCard = CardDatabaseManager::getInstance()->getCard(cardName); + CardInfoPtr currentCard = CardDatabaseManager::getInstance()->getCardInfo(cardName); if (currentCard) { QString colors = currentCard->getColors(); // Assuming this returns something like "WUB" for (const QChar &color : colors) { @@ -293,7 +293,7 @@ void DeckPreviewWidget::setBannerCard(int /* changedIndex */) CardRef cardRef = {name, id}; deckLoader->setBannerCard(cardRef); deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath)); - bannerCardDisplayWidget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId(cardRef)); + bannerCardDisplayWidget->setCard(CardDatabaseManager::getInstance()->getCard(cardRef)); } void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance) diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index 7d4ff69a5..5d536c473 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/cockatrice/src/deck/deck_list_model.cpp @@ -66,7 +66,7 @@ void DeckListModel::rebuildTree() continue; } - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); QString groupCriteria = getGroupCriteriaForCard(info); auto *groupNode = dynamic_cast(node->findChild(groupCriteria)); @@ -337,7 +337,7 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName, return nullptr; } - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(cardName); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(cardName); if (!info) { return nullptr; } @@ -375,8 +375,7 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneName, bool abAddAnyway) { - CardInfoPtr cardInfo = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, printingInfo.getProperty("uuid")}); + CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard({cardName, printingInfo.getProperty("uuid")}); if (cardInfo == nullptr) { if (abAddAnyway) { @@ -559,8 +558,7 @@ QList DeckListModel::getCardsAsCardInfoPtrs() const if (!currentCard) continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId(currentCard->toCardRef()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->toCardRef()); if (info) { cards.append(info); } else { @@ -593,8 +591,7 @@ QList DeckListModel::getCardsAsCardInfoPtrsForZone(QString zoneName if (!currentCard) continue; for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = - CardDatabaseManager::getInstance()->getCardByNameAndProviderId(currentCard->toCardRef()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(currentCard->toCardRef()); if (info) { cards.append(info); } else { diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index a0417fc52..07909f575 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -281,7 +281,7 @@ QString DeckLoader::exportDeckToDecklist(DecklistWebsite website) // Set up the function to call auto formatDeckListForExport = [&mainBoardCards, &sideBoardCards](const auto *node, const auto *card) { // Get the card name - CardInfoPtr dbCard = CardDatabaseManager::getInstance()->getCard(card->getName()); + CardInfoPtr dbCard = CardDatabaseManager::getInstance()->getCardInfo(card->getName()); if (!dbCard || dbCard->getIsToken()) { // If it's a token, we don't care about the card. return; @@ -466,7 +466,7 @@ void DeckLoader::saveToStream_DeckZone(QTextStream &out, for (int j = 0; j < zoneNode->size(); j++) { auto *card = dynamic_cast(zoneNode->at(j)); - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(card->getName()); + CardInfoPtr info = CardDatabaseManager::getInstance()->getCardInfo(card->getName()); QString cardType = info ? info->getMainCardType() : "unknown"; cardsByType.insert(cardType, card); @@ -582,7 +582,7 @@ bool DeckLoader::convertToCockatriceFormat(QString fileName) QString DeckLoader::getCardZoneFromName(QString cardName, QString currentZoneName) { - CardInfoPtr card = CardDatabaseManager::getInstance()->getCard(cardName); + CardInfoPtr card = CardDatabaseManager::getInstance()->getCardInfo(cardName); if (card && card->getIsToken()) { return DECK_ZONE_TOKENS; diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp index 19b8f4447..e95785fd6 100644 --- a/cockatrice/src/deck/deck_stats_interface.cpp +++ b/cockatrice/src/deck/deck_stats_interface.cpp @@ -70,7 +70,7 @@ void DeckStatsInterface::analyzeDeck(DeckList *deck) void DeckStatsInterface::copyDeckWithoutTokens(DeckList &source, DeckList &destination) { auto copyIfNotAToken = [this, &destination](const auto node, const auto card) { - CardInfoPtr dbCard = cardDatabase.getCard(card->getName()); + CardInfoPtr dbCard = cardDatabase.getCardInfo(card->getName()); if (dbCard && !dbCard->getIsToken()) { DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1); addedCard->setNumber(card->getNumber()); diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index a93a77963..83a27cc6a 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -152,7 +152,7 @@ void DlgEditTokens::actAddToken() name = getTextWithMax(this, tr("Add token"), tr("Please enter the name of the token:")); if (name.isEmpty()) return; - if (databaseModel->getDatabase()->getCard(name)) { + if (databaseModel->getDatabase()->getCardInfo(name)) { QMessageBox::critical(this, tr("Error"), tr("The chosen name conflicts with an existing card or token.\nMake sure to enable " "the 'Token' set in the \"Manage sets\" dialog to display them correctly.")); diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 903fd2c72..036994c05 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -222,7 +222,7 @@ QMap DlgSelectSetForCards::getSetsForCards() if (!currentCard) continue; - CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); if (!infoPtr) continue; @@ -290,12 +290,12 @@ void DlgSelectSetForCards::updateCardLists() if (!found) { // The card was not in any selected set - CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(uneditedCardsFlowWidget); picture_widget->setCard(infoPtr); uneditedCardsFlowWidget->addWidget(picture_widget); } else { - CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( + CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCard( {currentCard->getName(), CardDatabaseManager::getInstance() ->getSpecificPrinting(currentCard->getName(), foundSetName, "") .getProperty("uuid")}); @@ -376,7 +376,7 @@ QMap DlgSelectSetForCards::getCardsForSets() if (!currentCard) continue; - CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCard(currentCard->getName()); + CardInfoPtr infoPtr = CardDatabaseManager::getInstance()->getCardInfo(currentCard->getName()); if (!infoPtr) continue; @@ -628,7 +628,7 @@ void SetEntryWidget::updateCardDisplayWidgets() CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(cardListContainer); QString providerId = CardDatabaseManager::getInstance()->getSpecificPrinting(cardName, setName, nullptr).getProperty("uuid"); - picture_widget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, providerId})); + picture_widget->setCard(CardDatabaseManager::getInstance()->getCard({cardName, providerId})); cardListContainer->addWidget(picture_widget); } @@ -636,7 +636,7 @@ void SetEntryWidget::updateCardDisplayWidgets() CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(alreadySelectedCardListContainer); QString providerId = CardDatabaseManager::getInstance()->getSpecificPrinting(cardName, setName, nullptr).getProperty("uuid"); - picture_widget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId({cardName, providerId})); + picture_widget->setCard(CardDatabaseManager::getInstance()->getCard({cardName, providerId})); alreadySelectedCardListContainer->addWidget(picture_widget); } } diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 59867696e..5742263cf 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -57,7 +57,7 @@ void AbstractCardItem::pixmapUpdated() void AbstractCardItem::refreshCardInfo() { - info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(cardRef); + info = CardDatabaseManager::getInstance()->getCard(cardRef); if (!info && !cardRef.name.isEmpty()) { QVariantHash properties = QVariantHash(); diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 494533315..c23b033c0 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -109,12 +109,12 @@ void CardDatabase::removeCard(CardInfoPtr card) emit cardRemoved(card); } -CardInfoPtr CardDatabase::getCard(const QString &cardName) const +CardInfoPtr CardDatabase::getCardInfo(const QString &cardName) const { return cards.value(cardName); } -QList CardDatabase::getCards(const QStringList &cardNames) const +QList CardDatabase::getCardInfos(const QStringList &cardNames) const { QList cardInfos; for (const QString &cardName : cardNames) { @@ -126,11 +126,11 @@ QList CardDatabase::getCards(const QStringList &cardNames) const return cardInfos; } -QList CardDatabase::getCardsByNameAndProviderId(const QList &cardRefs) const +QList CardDatabase::getCards(const QList &cardRefs) const { QList cardInfos; for (const auto &cardRef : cardRefs) { - CardInfoPtr ptr = getCardByNameAndProviderId(cardRef); + CardInfoPtr ptr = getCard(cardRef); if (ptr) cardInfos.append(ptr); } @@ -138,9 +138,9 @@ QList CardDatabase::getCardsByNameAndProviderId(const QListsetPixmapCacheKey(QLatin1String("card_") + QString(card->getName()) + QString("_") + - QString(getPreferredPrintingProviderIdForCard(card->getName()))); + QString(getPreferredPrintingProviderId(card->getName()))); } } PrintingInfo CardDatabase::getPreferredPrinting(const QString &cardName) const { - CardInfoPtr cardInfo = getCard(cardName); + CardInfoPtr cardInfo = getCardInfo(cardName); return getPreferredPrinting(cardInfo); } @@ -337,7 +337,7 @@ PrintingInfo CardDatabase::getPreferredPrinting(const CardInfoPtr &cardInfo) con PrintingInfo CardDatabase::getSpecificPrinting(const CardRef &cardRef) const { - CardInfoPtr cardInfo = getCard(cardRef.name); + CardInfoPtr cardInfo = getCardInfo(cardRef.name); if (!cardInfo) { return PrintingInfo(nullptr); } @@ -366,7 +366,7 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const { - CardInfoPtr cardInfo = getCard(cardName); + CardInfoPtr cardInfo = getCardInfo(cardName); if (!cardInfo) { return PrintingInfo(nullptr); } @@ -394,7 +394,7 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, return PrintingInfo(nullptr); } -QString CardDatabase::getPreferredPrintingProviderIdForCard(const QString &cardName) +QString CardDatabase::getPreferredPrintingProviderId(const QString &cardName) { PrintingInfo preferredPrinting = getPreferredPrinting(cardName); QString uuid = preferredPrinting.getProperty("uuid"); @@ -402,20 +402,20 @@ QString CardDatabase::getPreferredPrintingProviderIdForCard(const QString &cardN return uuid; } - CardInfoPtr defaultCardInfo = getCard(cardName); + CardInfoPtr defaultCardInfo = getCardInfo(cardName); if (defaultCardInfo.isNull()) { return cardName; } return defaultCardInfo->getName(); } -bool CardDatabase::isProviderIdForPreferredPrinting(const CardRef &cardRef) +bool CardDatabase::isPreferredPrinting(const CardRef &cardRef) { if (cardRef.providerId.startsWith("card_")) { - return cardRef.providerId == QLatin1String("card_") + cardRef.name + QString("_") + - getPreferredPrintingProviderIdForCard(cardRef.name); + return cardRef.providerId == + QLatin1String("card_") + cardRef.name + QString("_") + getPreferredPrintingProviderId(cardRef.name); } - return cardRef.providerId == getPreferredPrintingProviderIdForCard(cardRef.name); + return cardRef.providerId == getPreferredPrintingProviderId(cardRef.name); } PrintingInfo CardDatabase::getSetInfoForCard(const CardInfoPtr &_card) diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index 653ba94cb..c12b1fc38 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -66,18 +66,19 @@ public: void clear(); void removeCard(CardInfoPtr card); - [[nodiscard]] CardInfoPtr getCard(const QString &cardName) const; - [[nodiscard]] QList getCards(const QStringList &cardNames) const; - QList getCardsByNameAndProviderId(const QList &cardRefs) const; - [[nodiscard]] CardInfoPtr getCardByNameAndProviderId(const CardRef &cardRef) const; + [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const; + [[nodiscard]] QList getCardInfos(const QStringList &cardNames) const; + + QList getCards(const QList &cardRefs) const; + [[nodiscard]] CardInfoPtr getCard(const CardRef &cardRef) const; [[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const; [[nodiscard]] PrintingInfo getPreferredPrinting(const CardInfoPtr &cardInfo) const; [[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const; PrintingInfo getSpecificPrinting(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const; - QString getPreferredPrintingProviderIdForCard(const QString &cardName); - bool isProviderIdForPreferredPrinting(const CardRef &cardRef); + QString getPreferredPrintingProviderId(const QString &cardName); + bool isPreferredPrinting(const CardRef &cardRef); [[nodiscard]] CardInfoPtr guessCard(const CardRef &cardRef) const; diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index f49c3ed19..87ea88b94 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -332,8 +332,7 @@ void DeckViewContainer::deckSelectFinished(const Response &r) { const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext); DeckLoader newDeck(QString::fromStdString(resp.deck())); - PictureLoader::cacheCardPixmaps( - CardDatabaseManager::getInstance()->getCardsByNameAndProviderId(newDeck.getCardRefList())); + PictureLoader::cacheCardPixmaps(CardDatabaseManager::getInstance()->getCards(newDeck.getCardRefList())); setDeck(newDeck); switchToDeckLoadedView(); } diff --git a/cockatrice/src/game/filters/deck_filter_string.cpp b/cockatrice/src/game/filters/deck_filter_string.cpp index 4d493e5f1..5ce8c8ed5 100644 --- a/cockatrice/src/game/filters/deck_filter_string.cpp +++ b/cockatrice/src/game/filters/deck_filter_string.cpp @@ -118,7 +118,7 @@ static void setupParserRules() return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool { int count = 0; deck->deckLoader->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) { - auto cardInfoPtr = CardDatabaseManager::getInstance()->getCard(node->getName()); + auto cardInfoPtr = CardDatabaseManager::getInstance()->getCardInfo(node->getName()); if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) { count += node->getNumber(); } diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 90e9340e6..85c14a85e 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1886,7 +1886,7 @@ void Player::actCreateAnotherToken() void Player::actCreatePredefinedToken() { auto *action = static_cast(sender()); - CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard(action->text()); + CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCardInfo(action->text()); if (!cardInfo) { return; } @@ -1912,8 +1912,8 @@ void Player::actCreateRelatedCard() * then let's allow it to be created via "create another token" */ if (createRelatedFromRelation(sourceCard, cardRelation) && cardRelation->getCanCreateAnother()) { - CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - {cardRelation->getName(), sourceCard->getProviderId()}); + CardInfoPtr cardInfo = + CardDatabaseManager::getInstance()->getCard({cardRelation->getName(), sourceCard->getProviderId()}); setLastToken(cardInfo); } } @@ -1993,7 +1993,7 @@ void Player::actCreateAllRelatedCards() * then assign the first to the "Create another" shortcut. */ if (cardRelation != nullptr && cardRelation->getCanCreateAnother()) { - CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard(cardRelation->getName()); + CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCardInfo(cardRelation->getName()); setLastToken(cardInfo); } } @@ -2040,7 +2040,7 @@ void Player::createCard(const CardItem *sourceCard, CardRelation::AttachType attachType, bool persistent) { - CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCard(dbCardName); + CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCardInfo(dbCardName); if (cardInfo == nullptr || sourceCard == nullptr) { return; @@ -4076,7 +4076,7 @@ void Player::addRelatedCardView(const CardItem *card, QMenu *cardMenu) bool atLeastOneGoodRelationFound = false; QList relatedCards = cardInfo->getAllRelatedCards(); for (const CardRelation *cardRelation : relatedCards) { - CardInfoPtr relatedCard = CardDatabaseManager::getInstance()->getCard(cardRelation->getName()); + CardInfoPtr relatedCard = CardDatabaseManager::getInstance()->getCardInfo(cardRelation->getName()); if (relatedCard != nullptr) { atLeastOneGoodRelationFound = true; break; @@ -4122,10 +4122,10 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu) int index = 0; QAction *createRelatedCards = nullptr; for (const CardRelation *cardRelation : relatedCards) { - CardInfoPtr relatedCard = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - {cardRelation->getName(), currentCardSet.getProperty("uuid")}); + CardInfoPtr relatedCard = + CardDatabaseManager::getInstance()->getCard({cardRelation->getName(), currentCardSet.getProperty("uuid")}); if (relatedCard == nullptr) { - relatedCard = CardDatabaseManager::getInstance()->getCard(cardRelation->getName()); + relatedCard = CardDatabaseManager::getInstance()->getCardInfo(cardRelation->getName()); } if (relatedCard == nullptr) { continue;