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/RawLibrary.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/RawLibrary.cpp')
| -rw-r--r-- | logic/minecraft/RawLibrary.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp index c4cd97a1..90883312 100644 --- a/logic/minecraft/RawLibrary.cpp +++ b/logic/minecraft/RawLibrary.cpp @@ -1,5 +1,5 @@ -#include "MMCJson.h" -using namespace MMCJson; +#include "Json.h" +using namespace Json; #include "RawLibrary.h" #include <pathutils.h> @@ -74,7 +74,7 @@ RawLibraryPtr RawLibrary::fromJsonPlus(const QJsonObject &libObj, const QString auto lib = RawLibrary::fromJson(libObj, filename); if (libObj.contains("insert")) { - QJsonValue insertVal = ensureExists(libObj.value("insert"), "library insert rule"); + QJsonValue insertVal = ensureJsonValue(libObj.value("insert"), "library insert rule"); if (insertVal.isString()) { // it's just a simple string rule. OK. |