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

remove unused dataDir variable

Browse source
This commit is contained in:
RickyRister 2025-04-20 21:36:58 -07:00
parent ca73033aea
commit 172bcb7477
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oracle/src/oracleimporter.cpp
View file

@ -19,7 +19,7 @@ SplitCardPart::SplitCardPart(const QString &_name,
const QRegularExpression OracleImporter::formatRegex = QRegularExpression("^format-"); const QRegularExpression OracleImporter::formatRegex = QRegularExpression("^format-");
OracleImporter::OracleImporter(const QString &_dataDir, QObject *parent) : QObject(parent), dataDir(_dataDir) OracleImporter::OracleImporter(QObject *parent) : QObject(parent)
{ {
} }

7
oracle/src/oracleimporter.h
View file

@ -137,7 +137,6 @@ private:
QList<SetToDownload> allSets; QList<SetToDownload> allSets;
QVariantMap setsMap; QVariantMap setsMap;
QString dataDir;
QString getMainCardType(const QStringList &typeList); QString getMainCardType(const QStringList &typeList);
CardInfoPtr addCard(QString name, CardInfoPtr addCard(QString name,
@ -151,7 +150,7 @@ signals:
void dataReadProgress(int bytesRead, int totalBytes); void dataReadProgress(int bytesRead, int totalBytes);
public: public:
explicit OracleImporter(const QString &_dataDir, QObject *parent = nullptr); explicit OracleImporter(QObject *parent = nullptr);
CardSet::Priority getSetPriority(QString &setType, QString &shortName); CardSet::Priority getSetPriority(QString &setType, QString &shortName);
bool readSetsFromByteArray(const QByteArray &data); bool readSetsFromByteArray(const QByteArray &data);
int startImport(); int startImport();
@ -165,10 +164,6 @@ public:
{ {
return allSets; return allSets;
} }
const QString &getDataDir() const
{
return dataDir;
}
void clear(); void clear();
protected: protected:

2
oracle/src/oraclewizard.cpp
View file

@ -60,7 +60,7 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this); settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this);
connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage); connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage);
importer = new OracleImporter(SettingsCache::instance().getDataPath(), this); importer = new OracleImporter(this);
nam = new QNetworkAccessManager(this); nam = new QNetworkAccessManager(this);