From 1b9c18951ad565bccdfcd55418aee36d5f568713 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Thu, 9 Mar 2017 14:11:14 +0100
Subject: [PATCH] ProjectNodes: Make folderNode(FileName) method inaccessible

Change-Id: Ie355ea8fd5e909e9c3e6e2630faabe366d02051a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/projectnodes.cpp | 20 ++++++++++----------
 src/plugins/projectexplorer/projectnodes.h   |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

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<FolderNode *>(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*> FolderNode::folderNodes() const
     return result;
 }
 
-
-FolderNode *FolderNode::folderNode(const Utils::FileName &directory) const
-{
-    return static_cast<FolderNode *>(Utils::findOrDefault(m_nodes, [&directory](const Node *n) {
-        const FolderNode *fn = n->asFolderNode();
-        return fn && fn->filePath() == directory;
-    }));
-}
-
 void FolderNode::buildTree(QList<FileNode *> &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<FileNode *> recursiveFileNodes() const;
     QList<FolderNode *> folderNodes() const;
-    FolderNode *folderNode(const Utils::FileName &directory) const;
     void buildTree(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName());
     void compress();