diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-02 01:51:40 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-02 01:51:40 +0100 |
| commit | 053b938beb7bb47fc63ec1ec2df519573629e32b (patch) | |
| tree | c0ed73a62a8400bc2ecb63fe82ee983545e2d421 /logic/OneSixVersionBuilder.h | |
| parent | 7c24bcc83476dcbdd7f7acbe14ecef4398962689 (diff) | |
| download | MultiMC-053b938beb7bb47fc63ec1ec2df519573629e32b.tar MultiMC-053b938beb7bb47fc63ec1ec2df519573629e32b.tar.gz MultiMC-053b938beb7bb47fc63ec1ec2df519573629e32b.tar.lz MultiMC-053b938beb7bb47fc63ec1ec2df519573629e32b.tar.xz MultiMC-053b938beb7bb47fc63ec1ec2df519573629e32b.zip | |
Get rid of parse flags
Diffstat (limited to 'logic/OneSixVersionBuilder.h')
| -rw-r--r-- | logic/OneSixVersionBuilder.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/logic/OneSixVersionBuilder.h b/logic/OneSixVersionBuilder.h index 8ca2551a..fe77ed9d 100644 --- a/logic/OneSixVersionBuilder.h +++ b/logic/OneSixVersionBuilder.h @@ -35,13 +35,6 @@ public: static QMap<QString, int> readOverrideOrders(OneSixInstance *instance); static bool writeOverrideOrders(const QMap<QString, int> &order, OneSixInstance *instance); - enum ParseFlag - { - NoFlags = 0x0, - IsFTBPackJson = 0x1 - }; - Q_DECLARE_FLAGS(ParseFlags, ParseFlag) - private: VersionFinal *m_version; OneSixInstance *m_instance; @@ -50,7 +43,5 @@ private: bool buildInternal(const bool onlyVanilla, const QStringList &external); bool readJsonAndApply(const QJsonObject &obj); - bool parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out, const ParseFlags flags = NoFlags); + bool parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out, bool isFTB = false); }; - -Q_DECLARE_OPERATORS_FOR_FLAGS(OneSixVersionBuilder::ParseFlags) |