diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2015-05-28 19:38:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-06-06 21:23:05 +0200 |
| commit | 3a8b238052163952831fb5924b2483a375e86ebd (patch) | |
| tree | ab120b4fac3a5345a20e7a09e1e7477e67d9ed6f /logic/minecraft/ProfileUtils.cpp | |
| parent | 161dc66c2c8d5f973ee69dab36c3969a7efd7495 (diff) | |
| download | MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.gz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.lz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.tar.xz MultiMC-3a8b238052163952831fb5924b2483a375e86ebd.zip | |
NOISSUE Various changes from multiauth that are unrelated to it
Diffstat (limited to 'logic/minecraft/ProfileUtils.cpp')
| -rw-r--r-- | logic/minecraft/ProfileUtils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp index 3eaca920..68fe0f14 100644 --- a/logic/minecraft/ProfileUtils.cpp +++ b/logic/minecraft/ProfileUtils.cpp @@ -1,6 +1,6 @@ #include "ProfileUtils.h" #include "minecraft/VersionFilterData.h" -#include "MMCJson.h" +#include "Json.h" #include <QDebug> #include <QJsonDocument> @@ -74,18 +74,18 @@ bool readOverrideOrders(QString path, PatchOrder &order) // and then read it and process it if all above is true. try { - auto obj = MMCJson::ensureObject(doc); + auto obj = Json::ensureObject(doc); // check order file version. - auto version = MMCJson::ensureInteger(obj.value("version"), "version"); + auto version = Json::ensureInteger(obj.value("version")); if (version != currentOrderFileVersion) { throw JSONValidationError(QObject::tr("Invalid order file version, expected %1") .arg(currentOrderFileVersion)); } - auto orderArray = MMCJson::ensureArray(obj.value("order")); + auto orderArray = Json::ensureArray(obj.value("order")); for(auto item: orderArray) { - order.append(MMCJson::ensureString(item)); + order.append(Json::ensureString(item)); } } catch (JSONValidationError &err) |