jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-11 20:43:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix signatures

Browse source
This commit is contained in:
RickyRister 2026-11-07 20:02:16 +01:00 • committed by Lukas Brübach
parent 598da954fc
commit d8213088e4
66 changed files with 143 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp
View file

@ -12,7 +12,7 @@
static constexpr int REBUILD_COALESCE_MS = 30;
CardDatabaseVisualDisplayModel::CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel,
CardDatabaseQuerier *_querier,
const CardDatabaseQuerier *_querier,
QObject *parent)
: QAbstractListModel(parent), displayModel(_displayModel), querier(_querier)
{

4
libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h
View file

@ -39,7 +39,7 @@ public:
* @param parent Parent object.
*/
explicit CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel,
CardDatabaseQuerier *_querier,
const CardDatabaseQuerier *_querier,
QObject *parent = nullptr);
/**
@ -81,7 +81,7 @@ private:
void appendPrintingsFor(const CardInfoPtr &info);
QPointer<CardDatabaseDisplayModel> displayModel;
CardDatabaseQuerier *querier;
const CardDatabaseQuerier *querier;
QStringList setFilterTerms;
QList<Entry> entries;
QTimer rebuildTimer;

12
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
View file

@ -103,7 +103,7 @@ void DeckListModel::rebuildTree()
continue;
}
CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
CardInfoPtr info = CardDatabaseManager::query().getCardInfo(currentCard->getName());
QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria);
auto *groupNode = dynamic_cast<InnerDecklistNode *>(node->findChild(groupCriteria));
@ -221,7 +221,7 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
return card->getNumber();
case DeckListModelColumns::CARD_NAME: {
if (role == Qt::DisplayRole) {
CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName());
CardInfoPtr info = CardDatabaseManager::query().getCardInfo(card->getName());
if (info) {
return info->getLocalizedName(displayLang);
}
@ -438,7 +438,7 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName,
const QString &providerId,
const QString &cardNumber) const
{
CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(cardName);
CardInfoPtr info = CardDatabaseManager::query().getCardInfo(cardName);
if (!info) {
return nullptr;
}
@ -493,7 +493,7 @@ QModelIndex DeckListModel::findCard(const QString &cardName,
QModelIndex DeckListModel::addPreferredPrintingCard(const QString &cardName, const QString &zoneName, bool abAddAnyway)
{
ExactCard card = CardDatabaseManager::query()->getCard({cardName});
ExactCard card = CardDatabaseManager::query().getCard({cardName});
if (!card) {
if (abAddAnyway) {
@ -910,7 +910,7 @@ static bool isCardQuantityLegalForFormat(const QString &format, const CardInfo &
return true;
}
auto formatRules = CardDatabaseManager::query()->getFormat(format);
auto formatRules = CardDatabaseManager::query().getFormat(format);
// if format has no custom rules, then just do the default check
if (!formatRules) {
@ -949,7 +949,7 @@ static bool isCardNodeLegalForFormat(const QString &format, const InnerDecklistN
}
// unknown cards are not legal
ExactCard exactCard = CardDatabaseManager::query()->getCard(card->toCardRef());
ExactCard exactCard = CardDatabaseManager::query().getCard(card->toCardRef());
if (!exactCard) {
return false;
}

4
libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
View file

@ -30,8 +30,8 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode
auto *lNode = static_cast<DecklistModelCardNode *>(left.internalPointer());
auto *rNode = static_cast<DecklistModelCardNode *>(right.internalPointer());
CardInfoPtr lInfo = CardDatabaseManager::query()->guessCard({lNode->getName()}).getCardPtr();
CardInfoPtr rInfo = CardDatabaseManager::query()->guessCard({rNode->getName()}).getCardPtr();
CardInfoPtr lInfo = CardDatabaseManager::query().guessCard({lNode->getName()}).getCardPtr();
CardInfoPtr rInfo = CardDatabaseManager::query().guessCard({rNode->getName()}).getCardPtr();
// Example: multiple tie-break criteria (colors > cmc > name)
for (const QString &crit : sortCriteria) {