walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix shadow warning

This commit is contained in:
Daniel Marjamäki 2018-11-19 10:21:02 +01:00
parent 4d8a85ec4d
commit f5c2abaefa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis_suppressions
View File

@ -6,7 +6,7 @@ nullPointer:build/checkother.cpp
missingOverride missingOverride
noValidConfiguration noValidConfiguration
useStlAlgorithm useStlAlgorithm
shadowLocal shadowFunction
*:gui/test/* *:gui/test/*
*:test/test.cxx *:test/test.cxx

8
gui/projectfiledialog.cpp
View File

@ -119,9 +119,9 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent)
} }
// Platforms.. // Platforms..
Platforms p; Platforms platforms;
for (int i = 0; i < numberOfBuiltinPlatforms; i++) for (int i = 0; i < numberOfBuiltinPlatforms; i++)
mUI.mComboBoxPlatform->addItem(p.get(builtinPlatforms[i]).mTitle); mUI.mComboBoxPlatform->addItem(platforms.get(builtinPlatforms[i]).mTitle);
QStringList platformFiles; QStringList platformFiles;
foreach (QString sp, searchPaths) { foreach (QString sp, searchPaths) {
if (sp.endsWith("/cfg")) if (sp.endsWith("/cfg"))
@ -133,8 +133,8 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent)
foreach (QFileInfo item, dir.entryInfoList()) { foreach (QFileInfo item, dir.entryInfoList()) {
const QString platformFile = item.fileName(); const QString platformFile = item.fileName();
cppcheck::Platform p; cppcheck::Platform plat2;
if (!p.loadPlatformFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString())) if (!plat2.loadPlatformFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString()))
continue; continue;
if (platformFiles.indexOf(platformFile) == -1) if (platformFiles.indexOf(platformFile) == -1)