aboutsummaryrefslogtreecommitdiff
path: root/launcher/meta/JsonFormat.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-06 10:34:05 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-06 10:34:05 +0300
commit6505a6280111e29b33d829703d1c1a87f90dba7a (patch)
tree696b9f52b5e4e03b54d919204b4eb7a47f8788d1 /launcher/meta/JsonFormat.cpp
parent1840505a0f887ebfc2c719113873ea3345b133fb (diff)
downloadPrismLauncher-6505a6280111e29b33d829703d1c1a87f90dba7a.tar.gz
PrismLauncher-6505a6280111e29b33d829703d1c1a87f90dba7a.tar.bz2
PrismLauncher-6505a6280111e29b33d829703d1c1a87f90dba7a.zip
Renamed requires fields
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/meta/JsonFormat.cpp')
-rw-r--r--launcher/meta/JsonFormat.cpp7
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())