refs #800 Fixed some declaration shadows variable in outer scope warnings.

This commit is contained in:
Mathew Sutcliffe
2016-11-10 00:39:09 +00:00
committed by Klaus Basan
parent 5791de6860
commit 6f972035ab
6 changed files with 15 additions and 15 deletions

View File

@@ -103,13 +103,13 @@ namespace BlackGui
return;
}
QJsonParseError jsonError;
QJsonDocument json(QJsonDocument::fromJson(jsonParts.toUtf8(), &jsonError));
QJsonDocument jsonDoc(QJsonDocument::fromJson(jsonParts.toUtf8(), &jsonError));
if (jsonError.error != QJsonParseError::NoError)
{
CLogMessage(this).validationError("Parse error: %1") << jsonError.errorString();
return;
}
parts.convertFromJson(json.object());
parts.convertFromJson(jsonDoc.object());
partsToGui(parts);
}
else