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

Nodes: Remove findFile and findFolder methods

Browse Source 
There may be more than one matching node, so these methods provided
a false sense of reliability.

Change-Id: I6471b74a1d2dd4e8afc7e836fec45355696a0741
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-26 16:02:25 +01:00
parent 3804de5023
commit 136f58c164
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -424,7 +424,14 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
// Handle files:
if (c->isFile()) {
ProjectExplorer::FileNode *fn = root->findFile(path);
ProjectExplorer::FileNode *fn = 0;
foreach (ProjectExplorer::FileNode *f, root->fileNodes()) {
// There can be one match only here!
if (f->path() != path)
continue;
fn = f;
break;
}
if (fn) {
filesToRemove.removeOne(fn);
if (updateExisting)
@@ -435,7 +442,14 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
}
continue;
} else {
FolderNode *fn = root->findSubFolder(c->path());
ProjectExplorer::FolderNode *fn = 0;
foreach (ProjectExplorer::FolderNode *f, root->subFolderNodes()) {
// There can be one match only here!
if (f->path() != path)
continue;
fn = f;
break;
}
if (!fn) {
fn = new FolderNode(c->path());
root->addFolderNodes(QList<FolderNode *>() << fn);