From bd29ea42156c2187cc10a9aeb6ca0df4df54f3fa Mon Sep 17 00:00:00 2001 From: Cameron McDonald Date: Thu, 15 Aug 2024 12:41:33 -0500 Subject: [PATCH] formatting --- cockatrice/src/game/cards/card_database.h | 3 +- oracle/src/oracleimporter.cpp | 6 ++-- oracle/src/oracleimporter.h | 44 +++++++++++------------ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index 042b9ed4f..ab0fbbba2 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -30,7 +30,8 @@ Q_DECLARE_METATYPE(CardInfoPtr) class CardSet : public QList { public: - enum Priority { + enum Priority + { PriorityUndefined = 0, PriorityPrimary = 10, PrioritySecondary = 20, diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 989328199..fe7da4721 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -503,9 +503,9 @@ int OracleImporter::startImport() sets.insert(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(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/oracleimporter.h b/oracle/src/oracleimporter.h index 9a3b7baf0..21374ce8c 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -9,32 +9,32 @@ // many users prefer not to see these sets with non english arts const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"}; const QMap setTypePriorities{ - {"core", CardSet::PriorityPrimary}, - {"expansion", CardSet::PriorityPrimary}, + {"core", CardSet::PriorityPrimary}, + {"expansion", CardSet::PriorityPrimary}, - {"commander", CardSet::PrioritySecondary}, - {"starter", CardSet::PrioritySecondary}, + {"commander", CardSet::PrioritySecondary}, + {"starter", CardSet::PrioritySecondary}, - {"archenemy", CardSet::PriorityReprint}, - {"arsenal", CardSet::PriorityReprint}, - {"box", CardSet::PriorityReprint}, + {"archenemy", CardSet::PriorityReprint}, + {"arsenal", CardSet::PriorityReprint}, + {"box", CardSet::PriorityReprint}, {"draft_innovation", CardSet::PriorityReprint}, - {"duel_deck", CardSet::PriorityReprint}, - {"from_the_vault", CardSet::PriorityReprint}, - {"masterpiece", CardSet::PriorityReprint}, - {"masters", CardSet::PriorityReprint}, - {"memorabilia", CardSet::PriorityReprint}, - {"planechase", CardSet::PriorityReprint}, - {"premium_deck", CardSet::PriorityReprint}, - {"promo", CardSet::PriorityReprint}, - {"spellbook", CardSet::PriorityReprint}, - {"token", CardSet::PriorityReprint}, - {"treasure_chest", CardSet::PriorityReprint}, + {"duel_deck", CardSet::PriorityReprint}, + {"from_the_vault", CardSet::PriorityReprint}, + {"masterpiece", CardSet::PriorityReprint}, + {"masters", CardSet::PriorityReprint}, + {"memorabilia", CardSet::PriorityReprint}, + {"planechase", CardSet::PriorityReprint}, + {"premium_deck", CardSet::PriorityReprint}, + {"promo", CardSet::PriorityReprint}, + {"spellbook", CardSet::PriorityReprint}, + {"token", CardSet::PriorityReprint}, + {"treasure_chest", CardSet::PriorityReprint}, - {"alchemy", CardSet::PriorityOther}, - {"funny", CardSet::PriorityOther}, - {"minigame", CardSet::PriorityOther}, - {"vanguard", CardSet::PriorityOther}, + {"alchemy", CardSet::PriorityOther}, + {"funny", CardSet::PriorityOther}, + {"minigame", CardSet::PriorityOther}, + {"vanguard", CardSet::PriorityOther}, }; class SetToDownload