From f5c2abaefa63ee17691c15da999a5459fce2bdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 19 Nov 2018 10:21:02 +0100 Subject: [PATCH] Fix shadow warning --- .travis_suppressions | 2 +- gui/projectfiledialog.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis_suppressions b/.travis_suppressions index d03b1faa2..cc9d7126f 100644 --- a/.travis_suppressions +++ b/.travis_suppressions @@ -6,7 +6,7 @@ nullPointer:build/checkother.cpp missingOverride noValidConfiguration useStlAlgorithm -shadowLocal +shadowFunction *:gui/test/* *:test/test.cxx diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp index ab53e13b8..5381d1f93 100644 --- a/gui/projectfiledialog.cpp +++ b/gui/projectfiledialog.cpp @@ -119,9 +119,9 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent) } // Platforms.. - Platforms p; + Platforms platforms; 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; foreach (QString sp, searchPaths) { if (sp.endsWith("/cfg")) @@ -133,8 +133,8 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent) foreach (QFileInfo item, dir.entryInfoList()) { const QString platformFile = item.fileName(); - cppcheck::Platform p; - if (!p.loadPlatformFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString())) + cppcheck::Platform plat2; + if (!plat2.loadPlatformFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString())) continue; if (platformFiles.indexOf(platformFile) == -1)