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

update usages

Browse source
This commit is contained in:
RickyRister 2025-12-07 23:38:09 -08:00
parent efb772df5a
commit 58c7a48725
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/client/network/parsers/interface_json_deck_parser.h
View file

@ -6,6 +6,8 @@
#ifndef INTERFACE_JSON_DECK_PARSER_H #ifndef INTERFACE_JSON_DECK_PARSER_H
#define INTERFACE_JSON_DECK_PARSER_H #define INTERFACE_JSON_DECK_PARSER_H
#include "../../../interface/deck_loader/card_node_function.h"
#include "../../../interface/deck_loader/deck_loader.h" #include "../../../interface/deck_loader/deck_loader.h"
#include <QJsonArray> #include <QJsonArray>
@ -48,7 +50,7 @@ public:
} }
loader->getDeckList()->loadFromStream_Plain(outStream, false); loader->getDeckList()->loadFromStream_Plain(outStream, false);
DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList()); loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
return loader; return loader;
} }
@ -95,7 +97,7 @@ public:
} }
loader->getDeckList()->loadFromStream_Plain(outStream, false); loader->getDeckList()->loadFromStream_Plain(outStream, false);
DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList()); loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
QJsonObject commandersObj = obj.value("commanders").toObject(); QJsonObject commandersObj = obj.value("commanders").toObject();
if (!commandersObj.isEmpty()) { if (!commandersObj.isEmpty()) {

5
cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
View file

@ -1,6 +1,7 @@
#include "dlg_load_deck_from_clipboard.h" #include "dlg_load_deck_from_clipboard.h"
#include "../../../client/settings/cache_settings.h" #include "../../../client/settings/cache_settings.h"
#include "../../deck_loader/card_node_function.h"
#include "../../deck_loader/deck_loader.h" #include "../../deck_loader/deck_loader.h"
#include "dlg_settings.h" #include "dlg_settings.h"
@ -82,9 +83,9 @@ bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckLoader *deckLoader) const
if (deckLoader->getDeckList()->loadFromStream_Plain(stream, true)) { if (deckLoader->getDeckList()->loadFromStream_Plain(stream, true)) {
if (loadSetNameAndNumberCheckBox->isChecked()) { if (loadSetNameAndNumberCheckBox->isChecked()) {
DeckLoader::resolveSetNameAndNumberToProviderID(deckLoader->getDeckList()); deckLoader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
} else { } else {
DeckLoader::clearSetNamesAndNumbers(deckLoader->getDeckList()); deckLoader->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
} }
return true; return true;
} }

2
cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
View file

@ -98,7 +98,7 @@ void DlgLoadDeckFromWebsite::accept()
DeckLoader *loader = new DeckLoader(this); DeckLoader *loader = new DeckLoader(this);
QTextStream stream(&deckText); QTextStream stream(&deckText);
loader->getDeckList()->loadFromStream_Plain(stream, false); loader->getDeckList()->loadFromStream_Plain(stream, false);
DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList()); loader->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
deck = loader; deck = loader;
QDialog::accept(); QDialog::accept();

7
cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_select_set_for_cards.h" #include "dlg_select_set_for_cards.h"
#include "../../deck_loader/card_node_function.h"
#include "../../deck_loader/deck_loader.h" #include "../../deck_loader/deck_loader.h"
#include "../interface/widgets/cards/card_info_picture_widget.h" #include "../interface/widgets/cards/card_info_picture_widget.h"
#include "../interface/widgets/general/layout_containers/flow_widget.h" #include "../interface/widgets/general/layout_containers/flow_widget.h"
@ -177,7 +178,7 @@ void DlgSelectSetForCards::actOK()
void DlgSelectSetForCards::actClear() void DlgSelectSetForCards::actClear()
{ {
emit deckAboutToBeModified(tr("Cleared all printing information.")); emit deckAboutToBeModified(tr("Cleared all printing information."));
DeckLoader::clearSetNamesAndNumbers(model->getDeckList()); model->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
emit deckModified(); emit deckModified();
accept(); accept();
} }
@ -185,8 +186,8 @@ void DlgSelectSetForCards::actClear()
void DlgSelectSetForCards::actSetAllToPreferred() void DlgSelectSetForCards::actSetAllToPreferred()
{ {
emit deckAboutToBeModified(tr("Set all printings to preferred.")); emit deckAboutToBeModified(tr("Set all printings to preferred."));
DeckLoader::clearSetNamesAndNumbers(model->getDeckList()); model->getDeckList()->forEachCard(CardNodeFunction::ClearPrintingData());
DeckLoader::setProviderIdToPreferredPrinting(model->getDeckList()); model->getDeckList()->forEachCard(CardNodeFunction::SetProviderIdToPreferred());
emit deckModified(); emit deckModified();
accept(); accept();
} }

3
cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
View file

@ -1,5 +1,6 @@
#include "archidekt_api_response_deck_display_widget.h" #include "archidekt_api_response_deck_display_widget.h"
#include "../../../../../deck_loader/card_node_function.h"
#include "../../../../../deck_loader/deck_loader.h" #include "../../../../../deck_loader/deck_loader.h"
#include "../../../../cards/card_info_picture_with_text_overlay_widget.h" #include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
#include "../../../../cards/card_size_widget.h" #include "../../../../cards/card_size_widget.h"
@ -68,7 +69,7 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset); connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset);
model->getDeckList()->loadFromStream_Plain(deckStream, false); model->getDeckList()->loadFromStream_Plain(deckStream, false);
DeckLoader::resolveSetNameAndNumberToProviderID(model->getDeckList()); model->getDeckList()->forEachCard(CardNodeFunction::ResolveProviderId());
model->rebuildTree(); model->rebuildTree();