diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-07 20:18:36 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-07 20:18:36 +0300 |
| commit | 8abe6b6732aa18b49199755c89dcedb90ae9c4b6 (patch) | |
| tree | 9c3d130d220caac170ce13adf7b90e816397e01c /launcher/meta/JsonFormat.cpp | |
| parent | e936bc4c60b4262cd70ff1eb3291dc3ead4c53ac (diff) | |
| parent | 9b9d439fce9408712a594bb294e3bd5f108e31bc (diff) | |
| download | PrismLauncher-8abe6b6732aa18b49199755c89dcedb90ae9c4b6.tar.gz PrismLauncher-8abe6b6732aa18b49199755c89dcedb90ae9c4b6.tar.bz2 PrismLauncher-8abe6b6732aa18b49199755c89dcedb90ae9c4b6.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
Diffstat (limited to 'launcher/meta/JsonFormat.cpp')
| -rw-r--r-- | launcher/meta/JsonFormat.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/launcher/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp index 473f37d6..cb2d06ea 100644 --- a/launcher/meta/JsonFormat.cpp +++ b/launcher/meta/JsonFormat.cpp @@ -56,10 +56,10 @@ static Version::Ptr parseCommonVersion(const QString &uid, const QJsonObject &ob version->setType(ensureString(obj, "type", QString())); version->setRecommended(ensureBoolean(obj, QString("recommended"), false)); version->setVolatile(ensureBoolean(obj, QString("volatile"), false)); - RequireSet requires, conflicts; - parseRequires(obj, &requires, "requires"); + RequireSet reqs, conflicts; + parseRequires(obj, &reqs, "requires"); parseRequires(obj, &conflicts, "conflicts"); - version->setRequires(requires, conflicts); + version->setRequires(reqs, conflicts); return version; } @@ -176,7 +176,6 @@ void parseRequires(const QJsonObject& obj, RequireSet* ptr, const char * keyName { if(obj.contains(keyName)) { - QSet<QString> requires; auto reqArray = requireArray(obj, keyName); auto iter = reqArray.begin(); while(iter != reqArray.end()) |