From b75c88d6c729a3274027d219a5f99834b131de48 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 20 Apr 2025 21:47:53 -0700 Subject: [PATCH] inline mainCardTypes list and make the method static --- oracle/src/oracleimporter.cpp | 7 +++++-- oracle/src/oracleimporter.h | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 324315304..845a10ea4 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -85,13 +85,16 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data) return true; } -QString OracleImporter::getMainCardType(const QStringList &typeList) +static QString getMainCardType(const QStringList &typeList) { if (typeList.isEmpty()) { return {}; } - for (const auto &type : mainCardTypes) { + static const QStringList typePriority = {"Planeswalker", "Creature", "Land", "Sorcery", + "Instant", "Artifact", "Enchantment"}; + + for (const auto &type : typePriority) { if (typeList.contains(type)) { return type; } diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 2e74db7d3..8232df259 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -121,8 +121,6 @@ class OracleImporter : public QObject { Q_OBJECT private: - const QStringList mainCardTypes = {"Planeswalker", "Creature", "Land", "Sorcery", - "Instant", "Artifact", "Enchantment"}; static const QRegularExpression formatRegex; /** @@ -137,7 +135,6 @@ private: QList allSets; - QString getMainCardType(const QStringList &typeList); CardInfoPtr addCard(QString name, QString text, bool isToken,