octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1301 from lioncash/qt

Browse Source 
game_list: Resolve variable shadowing within LoadCompatibilityList()
This commit is contained in:
bunnei
2018-09-11 23:13:54 -04:00
committed by GitHub
parent c245150439 0e61e8362f
commit 3ee4fa557f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/yuzu/game_list.cpp
View File

@@ -366,7 +366,7 @@ void GameList::LoadCompatibilityList() {
QJsonDocument json = QJsonDocument::fromJson(string_content.toUtf8()); QJsonDocument json = QJsonDocument::fromJson(string_content.toUtf8());
QJsonArray arr = json.array(); QJsonArray arr = json.array();
for (const QJsonValue& value : arr) { for (const QJsonValueRef& value : arr) {
QJsonObject game = value.toObject(); QJsonObject game = value.toObject();
if (game.contains("compatibility") && game["compatibility"].isDouble()) { if (game.contains("compatibility") && game["compatibility"].isDouble()) {
@@ -374,9 +374,9 @@ void GameList::LoadCompatibilityList() {
QString directory = game["directory"].toString(); QString directory = game["directory"].toString();
QJsonArray ids = game["releases"].toArray(); QJsonArray ids = game["releases"].toArray();
for (const QJsonValue& value : ids) { for (const QJsonValueRef& id_ref : ids) {
QJsonObject object = value.toObject(); QJsonObject id_object = id_ref.toObject();
QString id = object["id"].toString(); QString id = id_object["id"].toString();
compatibility_list.emplace( compatibility_list.emplace(
id.toUpper().toStdString(), id.toUpper().toStdString(),
std::make_pair(QString::number(compatibility), directory)); std::make_pair(QString::number(compatibility), directory));