feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Fix detaching of Qt containers in for loops

Browse Source 
Found by clazy.

Change-Id: I9ccca922f6aa8b6a8f1c16c6e62db8dae3c4cc6f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Joerg Bornemann
2017-10-19 13:46:45 +02:00
parent e71912b45b
commit a181c3e4d7
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -217,7 +217,8 @@ QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project)
QCoreApplication::translate("QbsRootProjectNode", "Qbs files")); QCoreApplication::translate("QbsRootProjectNode", "Qbs files"));
Utils::FileName base = project->projectDirectory(); Utils::FileName base = project->projectDirectory();
for (const QString &f : unreferencedBuildSystemFiles(project->qbsProject())) { const QStringList &files = unreferencedBuildSystemFiles(project->qbsProject());
for (const QString &f : files) {
const Utils::FileName filePath = Utils::FileName::fromString(f); const Utils::FileName filePath = Utils::FileName::fromString(f);
if (filePath.isChildOf(base)) if (filePath.isChildOf(base))
buildSystemFiles->addNestedNode(new ProjectExplorer::FileNode(filePath, ProjectExplorer::FileType::Project, false)); buildSystemFiles->addNestedNode(new ProjectExplorer::FileNode(filePath, ProjectExplorer::FileType::Project, false));

3
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -701,7 +701,8 @@ void QbsProject::configureAsExampleProject(const QSet<Id> &platforms)
= IBuildConfigurationFactory::find(k, projectFilePath().toString()); = IBuildConfigurationFactory::find(k, projectFilePath().toString());
if (!factory) if (!factory)
continue; continue;
for (BuildInfo * const info : factory->availableSetups(k, projectFilePath().toString())) const auto &buildInfos = factory->availableSetups(k, projectFilePath().toString());
for (BuildInfo * const info : buildInfos)
infoList << info; infoList << info;
} }
setup(infoList); setup(infoList);

6
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -106,7 +106,8 @@ static bool hasBuildGraph(const QString &dir)
static QStringList candidatesForDirectory(const QString &dir) static QStringList candidatesForDirectory(const QString &dir)
{ {
QStringList candidates; QStringList candidates;
for (const QString &subDir : QDir(dir).entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { const QStringList &subDirs = QDir(dir).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
for (const QString &subDir : subDirs) {
const QString absSubDir = dir + QLatin1Char('/') + subDir; const QString absSubDir = dir + QLatin1Char('/') + subDir;
if (hasBuildGraph(absSubDir)) if (hasBuildGraph(absSubDir))
candidates << absSubDir; candidates << absSubDir;
@@ -121,7 +122,8 @@ QStringList QbsProjectImporter::importCandidates()
QSet<QString> seenCandidates; QSet<QString> seenCandidates;
seenCandidates.insert(projectDir); seenCandidates.insert(projectDir);
for (Kit * const k : KitManager::kits()) { const auto &kits = KitManager::kits();
for (Kit * const k : kits) {
QFileInfo fi(buildDir(projectFilePath().toString(), k)); QFileInfo fi(buildDir(projectFilePath().toString(), k));
const QString candidate = fi.absolutePath(); const QString candidate = fi.absolutePath();
if (!seenCandidates.contains(candidate)) { if (!seenCandidates.contains(candidate)) {