diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-06-14 20:05:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 20:05:02 +0100 |
| commit | 3526d00a2330aad7d01f345816505c4d1cd5b096 (patch) | |
| tree | 31b34c829f21ef6f49bc3dda6bd1fc6b55ac7029 /launcher/meta/JsonFormat.cpp | |
| parent | 79ce7eb1fc9351e689e7106e3dc3a641d9614c9a (diff) | |
| parent | a4502f44c291fad2174e84bf883cdb754aa08e28 (diff) | |
| download | PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.tar.gz PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.tar.bz2 PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.zip | |
Merge branch 'develop' into feat/dont-hide-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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()) |