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

ProjectNodes: Make recursiveFindOrCreateFolderNode private

Browse Source 
Change-Id: I43315f19d931bec0ad7b81d3c72a4e7486f70445
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-09 13:05:47 +01:00
parent 1a5bdf14ad
commit aa51fd3962
2 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,50 @@
namespace ProjectExplorer {
static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
const Utils::FileName &directory,
const Utils::FileName &overrideBaseDir)
{
Utils::FileName path = overrideBaseDir.isEmpty() ? folder->filePath() : overrideBaseDir;
Utils::FileName directoryWithoutPrefix;
bool isRelative = false;
if (path.isEmpty() || path.toFileInfo().isRoot()) {
directoryWithoutPrefix = directory;
isRelative = false;
} else {
if (directory.isChildOf(path) || directory == path) {
isRelative = true;
directoryWithoutPrefix = directory.relativeChildPath(path);
} else {
isRelative = false;
directoryWithoutPrefix = directory;
}
}
QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts);
if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && parts.count() > 0)
parts[0].prepend('/');
ProjectExplorer::FolderNode *parent = folder;
foreach (const QString &part, parts) {
path.appendPath(part);
// Find folder in subFolders
FolderNode *next = parent->folderNode(path);
if (!next) {
// No FolderNode yet, so create it
auto tmp = new ProjectExplorer::FolderNode(path);
tmp->setDisplayName(part);
parent->addNode(tmp);
next = tmp;
}
parent = next;
}
return parent;
}
/*!
\class ProjectExplorer::Node
@@ -434,54 +478,14 @@ FolderNode *FolderNode::folderNode(const Utils::FileName &directory) const
}));
}
FolderNode *FolderNode::recursiveFindOrCreateFolderNode(const Utils::FileName &directory,
const Utils::FileName &overrideBaseDir)
{
Utils::FileName path = overrideBaseDir.isEmpty() ? filePath() : overrideBaseDir;
Utils::FileName directoryWithoutPrefix;
bool isRelative = false;
if (path.isEmpty() || path.toFileInfo().isRoot()) {
directoryWithoutPrefix = directory;
isRelative = false;
} else {
if (directory.isChildOf(path) || directory == path) {
isRelative = true;
directoryWithoutPrefix = directory.relativeChildPath(path);
} else {
isRelative = false;
directoryWithoutPrefix = directory;
}
}
QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts);
if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && parts.count() > 0)
parts[0].prepend('/');
ProjectExplorer::FolderNode *parent = this;
foreach (const QString &part, parts) {
path.appendPath(part);
// Find folder in subFolders
FolderNode *next = parent->folderNode(path);
if (!next) {
// No FolderNode yet, so create it
auto tmp = new ProjectExplorer::FolderNode(path);
tmp->setDisplayName(part);
parent->addNode(tmp);
next = tmp;
}
parent = next;
}
return parent;
}
void FolderNode::buildTree(QList<FileNode *> &files, const Utils::FileName &overrideBaseDir)
{
foreach (ProjectExplorer::FileNode *fn, files) {
// Get relative path to rootNode
QString parentDir = fn->filePath().toFileInfo().absolutePath();
ProjectExplorer::FolderNode *folder
= recursiveFindOrCreateFolderNode(Utils::FileName::fromString(parentDir), overrideBaseDir);
= recursiveFindOrCreateFolderNode(this, Utils::FileName::fromString(parentDir),
overrideBaseDir);
folder->addNode(fn);
}