diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index dfd379940c6..a1cbd8415d7 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -45,6 +45,15 @@ namespace ProjectExplorer { +static FolderNode *folderNode(const FolderNode *folder, const Utils::FileName &directory) +{ + return static_cast(Utils::findOrDefault(folder->nodes(), + [&directory](const Node *n) { + const FolderNode *fn = n->asFolderNode(); + return fn && fn->filePath() == directory; + })); +} + static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder, const Utils::FileName &directory, const Utils::FileName &overrideBaseDir) @@ -74,7 +83,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder, foreach (const QString &part, parts) { path.appendPath(part); // Find folder in subFolders - FolderNode *next = parent->folderNode(path); + FolderNode *next = folderNode(parent, path); if (!next) { // No FolderNode yet, so create it auto tmp = new ProjectExplorer::FolderNode(path); @@ -469,15 +478,6 @@ QList FolderNode::folderNodes() const return result; } - -FolderNode *FolderNode::folderNode(const Utils::FileName &directory) const -{ - return static_cast(Utils::findOrDefault(m_nodes, [&directory](const Node *n) { - const FolderNode *fn = n->asFolderNode(); - return fn && fn->filePath() == directory; - })); -} - void FolderNode::buildTree(QList &files, const Utils::FileName &overrideBaseDir) { foreach (ProjectExplorer::FileNode *fn, files) { diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 724b25ec0a5..e72eb835f24 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -199,7 +199,6 @@ public: FileNode *recursiveFileNode(const Utils::FileName &file) const; QList recursiveFileNodes() const; QList folderNodes() const; - FolderNode *folderNode(const Utils::FileName &directory) const; void buildTree(QList &files, const Utils::FileName &overrideBaseDir = Utils::FileName()); void compress();