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

ProjectNodes: Make folderNode(FileName) method inaccessible

Browse Source 
Change-Id: Ie355ea8fd5e909e9c3e6e2630faabe366d02051a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-09 14:11:14 +01:00
parent aa51fd3962
commit 1b9c18951a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -45,6 +45,15 @@
namespace ProjectExplorer { 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, static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
const Utils::FileName &directory, const Utils::FileName &directory,
const Utils::FileName &overrideBaseDir) const Utils::FileName &overrideBaseDir)
@@ -74,7 +83,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
foreach (const QString &part, parts) { foreach (const QString &part, parts) {
path.appendPath(part); path.appendPath(part);
// Find folder in subFolders // Find folder in subFolders
FolderNode *next = parent->folderNode(path); FolderNode *next = folderNode(parent, path);
if (!next) { if (!next) {
// No FolderNode yet, so create it // No FolderNode yet, so create it
auto tmp = new ProjectExplorer::FolderNode(path); auto tmp = new ProjectExplorer::FolderNode(path);
@@ -469,15 +478,6 @@ QList<FolderNode*> FolderNode::folderNodes() const
return result; 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) void FolderNode::buildTree(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir)
{ {
foreach (ProjectExplorer::FileNode *fn, files) { foreach (ProjectExplorer::FileNode *fn, files) {

1
src/plugins/projectexplorer/projectnodes.h
View File

@@ -199,7 +199,6 @@ public:
FileNode *recursiveFileNode(const Utils::FileName &file) const; FileNode *recursiveFileNode(const Utils::FileName &file) const;
QList<FileNode *> recursiveFileNodes() const; QList<FileNode *> recursiveFileNodes() const;
QList<FolderNode *> folderNodes() const; QList<FolderNode *> folderNodes() const;
FolderNode *folderNode(const Utils::FileName &directory) const;
void buildTree(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName()); void buildTree(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir = Utils::FileName());
void compress(); void compress();