diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 22edebac2..ed70a60fe 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -19,7 +19,7 @@ SplitCardPart::SplitCardPart(const QString &_name, const QRegularExpression OracleImporter::formatRegex = QRegularExpression("^format-"); -OracleImporter::OracleImporter(const QString &_dataDir, QObject *parent) : QObject(parent), dataDir(_dataDir) +OracleImporter::OracleImporter(QObject *parent) : QObject(parent) { } diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index b50c56d50..92d4faa8d 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -137,7 +137,6 @@ private: QList allSets; QVariantMap setsMap; - QString dataDir; QString getMainCardType(const QStringList &typeList); CardInfoPtr addCard(QString name, @@ -151,7 +150,7 @@ signals: void dataReadProgress(int bytesRead, int totalBytes); public: - explicit OracleImporter(const QString &_dataDir, QObject *parent = nullptr); + explicit OracleImporter(QObject *parent = nullptr); CardSet::Priority getSetPriority(QString &setType, QString &shortName); bool readSetsFromByteArray(const QByteArray &data); int startImport(); @@ -165,10 +164,6 @@ public: { return allSets; } - const QString &getDataDir() const - { - return dataDir; - } void clear(); protected: diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 785835cf4..bea87dde2 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -60,7 +60,7 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent) settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this); connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage); - importer = new OracleImporter(SettingsCache::instance().getDataPath(), this); + importer = new OracleImporter(this); nam = new QNetworkAccessManager(this);