diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 261bf62b..e8fe9e9d 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -7,42 +7,42 @@ class SetToDownload { private: - QString shortName, longName; - bool import; - QVariant cards; + QString shortName, longName; + bool import; + QVariant cards; QDate releaseDate; QString setType; public: - const QString &getShortName() const { return shortName; } - const QString &getLongName() const { return longName; } - const QVariant &getCards() const { return cards; } - const QString &getSetType() const { return setType; } - const QDate &getReleaseDate() const { return releaseDate; } - bool getImport() const { return import; } - void setImport(bool _import) { import = _import; } - SetToDownload(const QString &_shortName, const QString &_longName, const QVariant &_cards, bool _import, const QString &_setType = QString(), const QDate &_releaseDate = QDate()) - : shortName(_shortName), longName(_longName), import(_import), cards(_cards), setType(_setType), releaseDate(_releaseDate) { } - bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; } + const QString &getShortName() const { return shortName; } + const QString &getLongName() const { return longName; } + const QVariant &getCards() const { return cards; } + const QString &getSetType() const { return setType; } + const QDate &getReleaseDate() const { return releaseDate; } + bool getImport() const { return import; } + void setImport(bool _import) { import = _import; } + SetToDownload(const QString &_shortName, const QString &_longName, const QVariant &_cards, bool _import, const QString &_setType = QString(), const QDate &_releaseDate = QDate()) + : shortName(_shortName), longName(_longName), import(_import), cards(_cards), setType(_setType), releaseDate(_releaseDate) { } + bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; } }; class OracleImporter : public CardDatabase { - Q_OBJECT + Q_OBJECT private: - QList allSets; - QVariantMap setsMap; - QString dataDir; - - CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText); + QList allSets; + QVariantMap setsMap; + QString dataDir; + + CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText); signals: - void setIndexChanged(int cardsImported, int setIndex, const QString &setName); - void dataReadProgress(int bytesRead, int totalBytes); + void setIndexChanged(int cardsImported, int setIndex, const QString &setName); + void dataReadProgress(int bytesRead, int totalBytes); public: - OracleImporter(const QString &_dataDir, QObject *parent = 0); - bool readSetsFromByteArray(const QByteArray &data); - int startImport(); - int importTextSpoiler(CardSet *set, const QVariant &data); - QList &getSets() { return allSets; } - const QString &getDataDir() const { return dataDir; } + OracleImporter(const QString &_dataDir, QObject *parent = 0); + bool readSetsFromByteArray(const QByteArray &data); + int startImport(); + int importTextSpoiler(CardSet *set, const QVariant &data); + QList &getSets() { return allSets; } + const QString &getDataDir() const { return dataDir; } }; #endif