External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-15 16:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE disambiguate Json parsing calls

Browse Source
This commit is contained in:
Petr Mrázek
2022-05-29 04:58:42 +02:00
parent f59822fd65
commit 66c6e6e05d
16 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/ui/pages/modplatform/import_ftb/Model.cpp
View File

@@ -170,9 +170,10 @@ bool parseModpackJson(const QByteArray& data, Modpack & out) {
out.description = Json::ensureString(object, "description", QObject::tr("Description is missing in the FTB App instance."));
auto authorsArray = Json::ensureArray(object, "authors", QJsonArray());
for(auto author: authorsArray) {
out.authors.append(Json::requireString(author));
out.authors.append(Json::requireValueString(author));
}
out.mcVersion = Json::requireString(object, "mcVersion");
out.modLoader = Json::ensureString(object, "modLoader", QString());
out.hasInstMods = Json::ensureBoolean(object, "hasInstMods", false);

2
launcher/ui/pages/modplatform/technic/TechnicModel.cpp
View File

@@ -128,7 +128,7 @@ void Technic::ListModel::searchRequestFinished()
auto objs = Json::requireArray(root, "modpacks");
for (auto technicPack: objs) {
Modpack pack;
auto technicPackObject = Json::requireObject(technicPack);
auto technicPackObject = Json::requireValueObject(technicPack);
pack.name = Json::requireString(technicPackObject, "name");
pack.slug = Json::requireString(technicPackObject, "slug");
if (pack.slug == "vanilla")