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

Refactor out db queries from card db.

Browse source 
Took 42 minutes
This commit is contained in:
Lukas Brübach 2025-09-25 17:09:03 +02:00
parent 141bb90011
commit bc3de7c471
42 changed files with 468 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/interface/widgets/general/home_widget.cpp
View file

@ -89,7 +89,7 @@ void HomeWidget::updateRandomCard()
break;
case BackgroundSources::RandomCardArt:
do {
newCard = CardDatabaseManager::getInstance()->getRandomCard();
newCard = CardDatabaseManager::query()->getRandomCard();
} while (newCard == backgroundSourceCard->getCard() &&
newCard.getCardPtr()->getProperty("layout") != "normal");
break;
@ -99,17 +99,17 @@ void HomeWidget::updateRandomCard()
if (!cardRefs.empty()) {
if (cardRefs.size() == 1) {
newCard = CardDatabaseManager::getInstance()->getCard(cardRefs.first());
newCard = CardDatabaseManager::query()->getCard(cardRefs.first());
} else {
// Keep picking until different
do {
int idx = QRandomGenerator::global()->bounded(cardRefs.size());
newCard = CardDatabaseManager::getInstance()->getCard(cardRefs.at(idx));
newCard = CardDatabaseManager::query()->getCard(cardRefs.at(idx));
} while (newCard == oldCard);
}
} else {
do {
newCard = CardDatabaseManager::getInstance()->getRandomCard();
newCard = CardDatabaseManager::query()->getRandomCard();
} while (newCard == oldCard);
}
break;