diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:28:59 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:28:59 +0100 |
| commit | e3d2e5fd7405baa8137e300e8cc817e70df172b7 (patch) | |
| tree | 1829794eec361e593d612017e4502a7cf95b4252 /logic/OneSixVersionBuilder.h | |
| parent | 71467246079bd7545472bda161dcaf5549205d33 (diff) | |
| parent | 4883d1526222f9804f304f4cc189d6e44cb22b97 (diff) | |
| download | MultiMC-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar MultiMC-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar.gz MultiMC-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar.lz MultiMC-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar.xz MultiMC-e3d2e5fd7405baa8137e300e8cc817e70df172b7.zip | |
Merge branch 'fix_ftb' into integration_json_and_tools
Diffstat (limited to 'logic/OneSixVersionBuilder.h')
| -rw-r--r-- | logic/OneSixVersionBuilder.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/logic/OneSixVersionBuilder.h b/logic/OneSixVersionBuilder.h index ab0966df..8cf6f32f 100644 --- a/logic/OneSixVersionBuilder.h +++ b/logic/OneSixVersionBuilder.h @@ -29,19 +29,27 @@ class OneSixVersionBuilder { OneSixVersionBuilder(); public: - static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla); + static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla, const QStringList &external); static bool read(OneSixVersion *version, const QJsonObject &obj); 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: OneSixVersion *m_version; OneSixInstance *m_instance; QWidget *m_widgetParent; - bool build(const bool onlyVanilla); + bool build(const bool onlyVanilla, const QStringList &external); bool read(const QJsonObject &obj); - bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out); - + bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out, const ParseFlags flags = NoFlags); }; + +Q_DECLARE_OPERATORS_FOR_FLAGS(OneSixVersionBuilder::ParseFlags) |