diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 0331b287c..36001a566 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -23,6 +23,9 @@ set(oracle_SOURCES src/pagetemplates.cpp src/parsehelpers.cpp src/qt-json/json.cpp + ../cockatrice/src/client/settings/cache_settings.cpp + ../cockatrice/src/client/settings/card_counter_settings.cpp + ../cockatrice/src/client/settings/shortcuts_settings.cpp ../cockatrice/src/client/network/update/client/release_channel.cpp ../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp @@ -140,6 +143,7 @@ target_link_libraries( oracle PUBLIC libcockatrice_card PUBLIC libcockatrice_settings + PUBLIC libcockatrice_network PUBLIC ${ORACLE_QT_MODULES} ) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 204772857..38fa1de08 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,5 +1,6 @@ #include "oracleimporter.h" +#include "client/settings/cache_settings.h" #include "parsehelpers.h" #include "qt-json/json.h" @@ -463,13 +464,14 @@ int OracleImporter::startImport() { int setCards = 0, setIndex = 0; // add an empty set for tokens - CardSetPtr tokenSet = CardSet::newInstance(CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens"); + CardSetPtr tokenSet = CardSet::newInstance(SettingsCache::instance()->cardDatabase(), CardSet::TOKENS_SETNAME, + tr("Dummy set containing tokens"), "Tokens"); sets.insert(CardSet::TOKENS_SETNAME, tokenSet); for (const SetToDownload &curSetToParse : allSets) { - CardSetPtr newSet = - CardSet::newInstance(curSetToParse.getShortName(), curSetToParse.getLongName(), curSetToParse.getSetType(), - curSetToParse.getReleaseDate(), curSetToParse.getPriority()); + CardSetPtr newSet = CardSet::newInstance( + SettingsCache::instance()->cardDatabase(), curSetToParse.getShortName(), curSetToParse.getLongName(), + curSetToParse.getSetType(), curSetToParse.getReleaseDate(), curSetToParse.getPriority()); if (!sets.contains(newSet->getShortName())) sets.insert(newSet->getShortName(), newSet); diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 3d3350ede..e838a147b 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -1,6 +1,6 @@ #include "oraclewizard.h" -#include "../../../client/settings/cache_settings.h" +#include "client/settings/cache_settings.h" #include "main.h" #include "oracleimporter.h" #include "version_string.h"