mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-06 05:23:56 -07:00
Merge c4934ac17a into 7153f7d4c1
This commit is contained in:
commit
279359642d
47 changed files with 93 additions and 104 deletions
|
|
@ -16,7 +16,8 @@ CardDatabase::CardDatabase(QObject *parent,
|
|||
ICardPreferenceProvider *prefs,
|
||||
ICardDatabasePathProvider *pathProvider,
|
||||
ICardSetPriorityController *_setPriorityController)
|
||||
: QObject(parent), setPriorityController(_setPriorityController), loadStatus(NotLoaded)
|
||||
: QObject(parent), setPriorityController(_setPriorityController), loadStatus(NotLoaded),
|
||||
querier(CardDatabaseQuerier(this, prefs))
|
||||
{
|
||||
qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
|
||||
qRegisterMetaType<CardInfoPtr>("CardSetPtr");
|
||||
|
|
@ -28,8 +29,6 @@ CardDatabase::CardDatabase(QObject *parent,
|
|||
connect(loader, &CardDatabaseLoader::loadingFailed, this, &CardDatabase::cardDatabaseLoadingFailed);
|
||||
connect(loader, &CardDatabaseLoader::newSetsFound, this, &CardDatabase::cardDatabaseNewSetsFound);
|
||||
connect(loader, &CardDatabaseLoader::allNewSetsEnabled, this, &CardDatabase::cardDatabaseAllNewSetsEnabled);
|
||||
|
||||
querier = new CardDatabaseQuerier(this, this, prefs);
|
||||
}
|
||||
|
||||
CardDatabase::~CardDatabase()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue