mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-30 02:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync from quickmods

Browse source
This commit is contained in:
Petr Mrázek 2014-09-06 18:16:56 +02:00
parent 36efcf8d3c
commit 20cb97a35a
57 changed files with 569 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

10
logic/minecraft/VersionFile.cpp
View file

@ -22,8 +22,7 @@ int findLibraryByName(QList<OneSixLibraryPtr> haystack, const GradleSpecifier &n
int retval = -1;
for (int i = 0; i < haystack.size(); ++i)
{
if(haystack.at(i)->rawName().matchName(needle))
if (haystack.at(i)->rawName().matchName(needle))
{
// only one is allowed.
if (retval != -1)
@ -67,7 +66,7 @@ VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &fi
out->mcVersion = root.value("mcVersion").toString();
out->filename = filename;
auto readString = [root](const QString & key, QString & variable)
auto readString = [root](const QString &key, QString &variable)
{
if (root.contains(key))
{
@ -75,15 +74,14 @@ VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &fi
}
};
auto readStringRet = [root](const QString & key)->QString
auto readStringRet = [root](const QString &key) -> QString
{
if (root.contains(key))
{
return ensureString(root.value(key));
}
return QString();
}
;
};
// FIXME: This should be ignored when applying.
if (!isFTB)