External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-03 16:51:30 +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

2
launcher/modplatform/atlauncher/ATLPackIndex.cpp
View File

@@ -38,7 +38,7 @@ void ATLauncher::loadIndexedPack(ATLauncher::IndexedPack & m, QJsonObject & obj)
auto versionsArr = Json::requireArray(obj, "versions");
for (const auto versionRaw : versionsArr)
{
auto versionObj = Json::requireObject(versionRaw);
auto versionObj = Json::requireValueObject(versionRaw);
ATLauncher::IndexedVersion version;
loadIndexedVersion(version, versionObj);
m.versions.append(version);

6
launcher/modplatform/atlauncher/ATLPackManifest.cpp
View File

@@ -175,7 +175,7 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
if(obj.contains("depends")) {
auto dependsArr = Json::requireArray(obj, "depends");
for (const auto depends : dependsArr) {
p.depends.append(Json::requireString(depends));
p.depends.append(Json::requireValueString(depends));
}
}
@@ -222,7 +222,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
auto libraries = Json::requireArray(obj, "libraries");
for (const auto libraryRaw : libraries)
{
auto libraryObj = Json::requireObject(libraryRaw);
auto libraryObj = Json::requireValueObject(libraryRaw);
ATLauncher::VersionLibrary target;
loadVersionLibrary(target, libraryObj);
v.libraries.append(target);
@@ -233,7 +233,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
auto mods = Json::requireArray(obj, "mods");
for (const auto modRaw : mods)
{
auto modObj = Json::requireObject(modRaw);
auto modObj = Json::requireValueObject(modRaw);
ATLauncher::VersionMod mod;
loadVersionMod(mod, modObj);
v.mods.append(mod);

2
launcher/modplatform/technic/SolderPackInstallTask.cpp
View File

@@ -89,7 +89,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
QJsonArray mods = Json::requireArray(obj, "mods", "'mods'");
for (auto mod: mods)
{
QJsonObject modObject = Json::requireObject(mod);
QJsonObject modObject = Json::requireValueObject(mod);
modUrls.append(Json::requireString(modObject, "url", "'url'"));
}
}

2
launcher/modplatform/technic/TechnicPackProcessor.cpp
View File

@@ -171,7 +171,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
continue;
}
auto libraryObject = Json::ensureObject(library, {}, "");
auto libraryObject = Json::ensureValueObject(library, {}, "");
auto libraryName = Json::ensureString(libraryObject, "name", "", "");
if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))