Browse Source
Merge pull request #1301 from lioncash/qt
game_list: Resolve variable shadowing within LoadCompatibilityList()
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
src/yuzu/game_list.cpp
|
|
|
@ -366,7 +366,7 @@ void GameList::LoadCompatibilityList() { |
|
|
|
QJsonDocument json = QJsonDocument::fromJson(string_content.toUtf8()); |
|
|
|
QJsonArray arr = json.array(); |
|
|
|
|
|
|
|
for (const QJsonValue& value : arr) { |
|
|
|
for (const QJsonValueRef& value : arr) { |
|
|
|
QJsonObject game = value.toObject(); |
|
|
|
|
|
|
|
if (game.contains("compatibility") && game["compatibility"].isDouble()) { |
|
|
|
@ -374,9 +374,9 @@ void GameList::LoadCompatibilityList() { |
|
|
|
QString directory = game["directory"].toString(); |
|
|
|
QJsonArray ids = game["releases"].toArray(); |
|
|
|
|
|
|
|
for (const QJsonValue& value : ids) { |
|
|
|
QJsonObject object = value.toObject(); |
|
|
|
QString id = object["id"].toString(); |
|
|
|
for (const QJsonValueRef& id_ref : ids) { |
|
|
|
QJsonObject id_object = id_ref.toObject(); |
|
|
|
QString id = id_object["id"].toString(); |
|
|
|
compatibility_list.emplace( |
|
|
|
id.toUpper().toStdString(), |
|
|
|
std::make_pair(QString::number(compatibility), directory)); |
|
|
|
|