diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 10:35:26 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 10:35:26 +0300 |
| commit | 182e19eae3e2aa9f50dde140d10db858b5bf6076 (patch) | |
| tree | e36e6ddfeb937b52208ccd6bd2d9fc10cd6c4a37 /launcher/meta/JsonFormat.cpp | |
| parent | 9ca74cd0095a7e2be40e72e36f5b51dd80f198bb (diff) | |
| parent | 9908e115aa6bdfcceefd1425406d1b6d1c1bdec4 (diff) | |
| download | PrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.tar.gz PrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.tar.bz2 PrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
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()) |