diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-05-11 12:37:21 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:30 +0200 |
| commit | 69c3e7111f93290d1278d6116e9fd50079b4fe79 (patch) | |
| tree | cbaed3022e8705f1da29777afea0fca16c1abe60 /logic/MMCJson.cpp | |
| parent | 92abe4c603e1f4931cd02ae6b752cb7054d8e30d (diff) | |
| download | MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.gz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.lz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.xz MultiMC-69c3e7111f93290d1278d6116e9fd50079b4fe79.zip | |
Make 1.6+ work with new instance format.
Diffstat (limited to 'logic/MMCJson.cpp')
| -rw-r--r-- | logic/MMCJson.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/logic/MMCJson.cpp b/logic/MMCJson.cpp index 65423436..f7b4b6b0 100644 --- a/logic/MMCJson.cpp +++ b/logic/MMCJson.cpp @@ -11,7 +11,7 @@ bool MMCJson::ensureBoolean(const QJsonValue val, const QString what) QJsonValue MMCJson::ensureExists(QJsonValue val, const QString what) { - if(val.isNull()) + if(val.isUndefined() || val.isUndefined()) throw JSONValidationError(what + " does not exist"); return val; } @@ -59,3 +59,24 @@ QString MMCJson::ensureString(const QJsonValue val, const QString what) return val.toString(); } +void MMCJson::writeString(QJsonObject &to, QString key, QString value) +{ + if(value.size()) + { + to.insert(key, value); + } +} + +void MMCJson::writeStringList(QJsonObject &to, QString key, QStringList values) +{ + if(values.size()) + { + QJsonArray array; + for(auto value: values) + { + array.append(value); + } + to.insert(key, array); + } +} + |