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

ProjectExplorer: Make naming of methods on Nodes more consistent

Browse Source 
Change-Id: I5050a020f0fc0ef4556db1d2020afeadfcd51585
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-09 12:28:25 +01:00
parent b782b98fef
commit 67e011ba5f
14 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/classview/classviewparser.cpp
View File

@@ -718,7 +718,7 @@ QStringList Parser::projectNodeFileList(const FolderNode *node) const
return list; return list;
QList<FileNode *> fileNodes = node->fileNodes(); QList<FileNode *> fileNodes = node->fileNodes();
QList<FolderNode *> subFolderNodes = node->subFolderNodes(); QList<FolderNode *> subFolderNodes = node->folderNodes();
foreach (const FileNode *file, fileNodes) { foreach (const FileNode *file, fileNodes) {
if (file->isGenerated()) if (file->isGenerated())
@@ -768,7 +768,7 @@ QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item, const Projec
} }
// subnodes // subnodes
QList<ProjectNode *> projectNodes = node->subProjectNodes(); QList<ProjectNode *> projectNodes = node->projectNodes();
foreach (const ProjectNode *project, projectNodes) { foreach (const ProjectNode *project, projectNodes) {
ParserTreeItem::Ptr itemPrj(new ParserTreeItem()); ParserTreeItem::Ptr itemPrj(new ParserTreeItem());
@@ -804,7 +804,7 @@ QStringList Parser::getAllFiles(const ProjectNode *node)
d->cachedPrjFileLists[nodePath] = fileList; d->cachedPrjFileLists[nodePath] = fileList;
} }
// subnodes // subnodes
QList<ProjectNode *> projectNodes = node->subProjectNodes(); QList<ProjectNode *> projectNodes = node->projectNodes();
foreach (const ProjectNode *project, projectNodes) foreach (const ProjectNode *project, projectNodes)
fileList += getAllFiles(project); fileList += getAllFiles(project);

4
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -296,7 +296,7 @@ void UpdateIncludeDependenciesVisitor::collectElementPaths(const ProjectExplorer
QStringList elementsPath = qmt::NameController::buildElementsPath(nodePath, false); QStringList elementsPath = qmt::NameController::buildElementsPath(nodePath, false);
filePathsMap->insertMulti(elementName, Node(fileNode->filePath().toString(), elementsPath)); filePathsMap->insertMulti(elementName, Node(fileNode->filePath().toString(), elementsPath));
} }
foreach (const ProjectExplorer::FolderNode *subNode, folderNode->subFolderNodes()) foreach (const ProjectExplorer::FolderNode *subNode, folderNode->folderNodes())
collectElementPaths(subNode, filePathsMap); collectElementPaths(subNode, filePathsMap);
} }
@@ -419,7 +419,7 @@ void ComponentViewController::createComponentModel(const ProjectExplorer::Folder
} }
} }
foreach (const ProjectExplorer::FolderNode *subNode, folderNode->subFolderNodes()) foreach (const ProjectExplorer::FolderNode *subNode, folderNode->folderNodes())
createComponentModel(subNode, diagram, anchorFolder); createComponentModel(subNode, diagram, anchorFolder);
} }

2
src/plugins/modeleditor/modelindexer.cpp
View File

@@ -456,7 +456,7 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode)
if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL)) if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL))
return fileNode->filePath().toString(); return fileNode->filePath().toString();
} }
foreach (ProjectExplorer::FolderNode *subFolderNode, folderNode->subFolderNodes()) { foreach (ProjectExplorer::FolderNode *subFolderNode, folderNode->folderNodes()) {
QString modelFileName = findFirstModel(subFolderNode); QString modelFileName = findFirstModel(subFolderNode);
if (!modelFileName.isEmpty()) if (!modelFileName.isEmpty())
return modelFileName; return modelFileName;

2
src/plugins/nim/project/nimproject.cpp
View File

@@ -162,7 +162,7 @@ FileNameList NimProject::nimFiles() const
if (file->displayName().endsWith(QLatin1String(".nim"))) if (file->displayName().endsWith(QLatin1String(".nim")))
result.append(file->filePath()); result.append(file->filePath());
} }
folders.append(folder->subFolderNodes()); folders.append(folder->folderNodes());
} }
return result; return result;

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -2002,12 +2002,12 @@ static QString pathOrDirectoryFor(Node *node, bool dir)
if (node->nodeType() == NodeType::VirtualFolder && folder) { if (node->nodeType() == NodeType::VirtualFolder && folder) {
// Virtual Folder case // Virtual Folder case
// If there are files directly below or no subfolders, take the folder path // If there are files directly below or no subfolders, take the folder path
if (!folder->fileNodes().isEmpty() || folder->subFolderNodes().isEmpty()) { if (!folder->fileNodes().isEmpty() || folder->folderNodes().isEmpty()) {
location = path.toString(); location = path.toString();
} else { } else {
// Otherwise we figure out a commonPath from the subfolders // Otherwise we figure out a commonPath from the subfolders
QStringList list; QStringList list;
foreach (FolderNode *f, folder->subFolderNodes()) foreach (FolderNode *f, folder->folderNodes())
list << f->filePath().toString() + QLatin1Char('/'); list << f->filePath().toString() + QLatin1Char('/');
location = Utils::commonPath(list); location = Utils::commonPath(list);
} }

8
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -383,7 +383,7 @@ bool FlatModel::canFetchMore(const QModelIndex & parent) const
void FlatModel::recursiveAddFolderNodes(FolderNode *startNode, QList<Node *> *list, const QSet<Node *> &blackList) const void FlatModel::recursiveAddFolderNodes(FolderNode *startNode, QList<Node *> *list, const QSet<Node *> &blackList) const
{ {
foreach (FolderNode *folderNode, startNode->subFolderNodes()) { foreach (FolderNode *folderNode, startNode->folderNodes()) {
if (folderNode && !blackList.contains(folderNode)) if (folderNode && !blackList.contains(folderNode))
recursiveAddFolderNodesImpl(folderNode, list, blackList); recursiveAddFolderNodesImpl(folderNode, list, blackList);
} }
@@ -395,7 +395,7 @@ void FlatModel::recursiveAddFolderNodesImpl(FolderNode *startNode, QList<Node *>
if (!blackList.contains(startNode)) if (!blackList.contains(startNode))
list->append(startNode); list->append(startNode);
} else { } else {
foreach (FolderNode *folderNode, startNode->subFolderNodes()) { foreach (FolderNode *folderNode, startNode->folderNodes()) {
if (folderNode && !blackList.contains(folderNode)) if (folderNode && !blackList.contains(folderNode))
recursiveAddFolderNodesImpl(folderNode, list, blackList); recursiveAddFolderNodesImpl(folderNode, list, blackList);
} }
@@ -404,7 +404,7 @@ void FlatModel::recursiveAddFolderNodesImpl(FolderNode *startNode, QList<Node *>
void FlatModel::recursiveAddFileNodes(FolderNode *startNode, QList<Node *> *list, const QSet<Node *> &blackList) const void FlatModel::recursiveAddFileNodes(FolderNode *startNode, QList<Node *> *list, const QSet<Node *> &blackList) const
{ {
foreach (FolderNode *subFolderNode, startNode->subFolderNodes()) { foreach (FolderNode *subFolderNode, startNode->folderNodes()) {
if (!blackList.contains(subFolderNode)) if (!blackList.contains(subFolderNode))
recursiveAddFileNodes(subFolderNode, list, blackList); recursiveAddFileNodes(subFolderNode, list, blackList);
} }
@@ -852,7 +852,7 @@ void FlatModel::foldersAboutToBeRemoved(FolderNode *parentFolder, const QList<Fo
void FlatModel::removeFromCache(QList<FolderNode *> list) void FlatModel::removeFromCache(QList<FolderNode *> list)
{ {
foreach (FolderNode *fn, list) { foreach (FolderNode *fn, list) {
removeFromCache(fn->subFolderNodes()); removeFromCache(fn->folderNodes());
m_childNodes.remove(fn); m_childNodes.remove(fn);
} }
} }

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

@@ -299,7 +299,7 @@ FolderNode::FolderNode(const Utils::FileName &folderPath, NodeType nodeType, con
FolderNode::~FolderNode() FolderNode::~FolderNode()
{ {
qDeleteAll(m_subFolderNodes); qDeleteAll(m_folderNodes);
qDeleteAll(m_fileNodes); qDeleteAll(m_fileNodes);
} }
@@ -334,17 +334,17 @@ QList<FileNode*> FolderNode::fileNodes() const
QList<FileNode *> FolderNode::recursiveFileNodes() const QList<FileNode *> FolderNode::recursiveFileNodes() const
{ {
QList<FileNode *> result = fileNodes(); QList<FileNode *> result = fileNodes();
foreach (ProjectExplorer::FolderNode *folder, subFolderNodes()) foreach (ProjectExplorer::FolderNode *folder, folderNodes())
result.append(folder->recursiveFileNodes()); result.append(folder->recursiveFileNodes());
return result; return result;
} }
QList<FolderNode*> FolderNode::subFolderNodes() const QList<FolderNode*> FolderNode::folderNodes() const
{ {
return m_subFolderNodes; return m_folderNodes;
} }
FolderNode *FolderNode::findOrCreateSubFolderNode(const QString &directory) FolderNode *FolderNode::findOrCreateFolderNode(const QString &directory)
{ {
Utils::FileName path = filePath(); Utils::FileName path = filePath();
QDir parentDir(path.toString()); QDir parentDir(path.toString());
@@ -357,7 +357,7 @@ FolderNode *FolderNode::findOrCreateSubFolderNode(const QString &directory)
path.appendPath(part); path.appendPath(part);
// Find folder in subFolders // Find folder in subFolders
bool found = false; bool found = false;
foreach (ProjectExplorer::FolderNode *folder, parent->subFolderNodes()) { foreach (ProjectExplorer::FolderNode *folder, parent->folderNodes()) {
if (folder->filePath() == path) { if (folder->filePath() == path) {
// yeah found something :) // yeah found something :)
parent = folder; parent = folder;
@@ -397,7 +397,7 @@ void FolderNode::buildTree(QList<FileNode *> &files)
foreach (ProjectExplorer::FileNode *fn, added) { foreach (ProjectExplorer::FileNode *fn, added) {
// Get relative path to rootNode // Get relative path to rootNode
QString parentDir = fn->filePath().toFileInfo().absolutePath(); QString parentDir = fn->filePath().toFileInfo().absolutePath();
ProjectExplorer::FolderNode *folder = findOrCreateSubFolderNode(parentDir); ProjectExplorer::FolderNode *folder = findOrCreateFolderNode(parentDir);
addedFolderMapping[folder] << fn; addedFolderMapping[folder] << fn;
} }
@@ -416,7 +416,7 @@ void FolderNode::buildTree(QList<FileNode *> &files)
continue; continue;
// Check for empty parent // Check for empty parent
while (parent->subFolderNodes().isEmpty() && parent->fileNodes().isEmpty()) { while (parent->folderNodes().isEmpty() && parent->fileNodes().isEmpty()) {
ProjectExplorer::FolderNode *grandparent = parent->parentFolderNode(); ProjectExplorer::FolderNode *grandparent = parent->parentFolderNode();
grandparent->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent); grandparent->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent);
parent = grandparent; parent = grandparent;
@@ -429,7 +429,7 @@ void FolderNode::buildTree(QList<FileNode *> &files)
void FolderNode::accept(NodesVisitor *visitor) void FolderNode::accept(NodesVisitor *visitor)
{ {
visitor->visitFolderNode(this); visitor->visitFolderNode(this);
foreach (FolderNode *subFolder, m_subFolderNodes) foreach (FolderNode *subFolder, m_folderNodes)
subFolder->accept(visitor); subFolder->accept(visitor);
} }
@@ -584,14 +584,14 @@ void FolderNode::addFolderNodes(const QList<FolderNode*> &subFolders)
folder->setProjectNode(projectNode()); folder->setProjectNode(projectNode());
// Find the correct place to insert // Find the correct place to insert
if (m_subFolderNodes.count() == 0 if (m_folderNodes.count() == 0
|| m_subFolderNodes.last() < folder) { || m_folderNodes.last() < folder) {
// empty list or greater then last node // empty list or greater then last node
m_subFolderNodes.append(folder); m_folderNodes.append(folder);
} else { } else {
// Binary Search for insertion point // Binary Search for insertion point
auto it = std::lower_bound(m_subFolderNodes.begin(), m_subFolderNodes.end(), folder); auto it = std::lower_bound(m_folderNodes.begin(), m_folderNodes.end(), folder);
m_subFolderNodes.insert(it, folder); m_folderNodes.insert(it, folder);
} }
// project nodes have to be added via addProjectNodes // project nodes have to be added via addProjectNodes
@@ -621,17 +621,17 @@ void FolderNode::removeFolderNodes(const QList<FolderNode*> &subFolders)
ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove); ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove);
auto toRemoveIter = toRemove.constBegin(); auto toRemoveIter = toRemove.constBegin();
auto folderIter = m_subFolderNodes.begin(); auto folderIter = m_folderNodes.begin();
for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) { for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) {
QTC_ASSERT((*toRemoveIter)->nodeType() != NodeType::Project, QTC_ASSERT((*toRemoveIter)->nodeType() != NodeType::Project,
qDebug("project nodes have to be removed via removeProjectNodes")); qDebug("project nodes have to be removed via removeProjectNodes"));
while (*folderIter != *toRemoveIter) { while (*folderIter != *toRemoveIter) {
++folderIter; ++folderIter;
QTC_ASSERT(folderIter != m_subFolderNodes.end(), QTC_ASSERT(folderIter != m_folderNodes.end(),
qDebug("Folder to remove is not part of specified folder!")); qDebug("Folder to remove is not part of specified folder!"));
} }
delete *folderIter; delete *folderIter;
folderIter = m_subFolderNodes.erase(folderIter); folderIter = m_folderNodes.erase(folderIter);
} }
ProjectTree::instance()->emitFoldersRemoved(this); ProjectTree::instance()->emitFoldersRemoved(this);
@@ -700,9 +700,9 @@ QString ProjectNode::vcsTopic() const
return QString(); return QString();
} }
QList<ProjectNode*> ProjectNode::subProjectNodes() const QList<ProjectNode*> ProjectNode::projectNodes() const
{ {
return m_subProjectNodes; return m_projectNodes;
} }
bool ProjectNode::canAddSubProject(const QString &proFilePath) const bool ProjectNode::canAddSubProject(const QString &proFilePath) const
@@ -777,7 +777,7 @@ void ProjectNode::accept(NodesVisitor *visitor)
{ {
visitor->visitProjectNode(this); visitor->visitProjectNode(this);
foreach (FolderNode *folder, m_subFolderNodes) foreach (FolderNode *folder, m_folderNodes)
folder->accept(visitor); folder->accept(visitor);
} }
@@ -798,11 +798,11 @@ void ProjectNode::addProjectNodes(const QList<ProjectNode*> &subProjects)
QTC_ASSERT(!project->parentFolderNode() || project->parentFolderNode() == this, QTC_ASSERT(!project->parentFolderNode() || project->parentFolderNode() == this,
qDebug("Project node has already a parent")); qDebug("Project node has already a parent"));
project->setParentFolderNode(this); project->setParentFolderNode(this);
m_subFolderNodes.append(project); m_folderNodes.append(project);
m_subProjectNodes.append(project); m_projectNodes.append(project);
} }
Utils::sort(m_subFolderNodes); Utils::sort(m_folderNodes);
Utils::sort(m_subProjectNodes); Utils::sort(m_projectNodes);
ProjectTree::instance()->emitFoldersAdded(this); ProjectTree::instance()->emitFoldersAdded(this);
} }
@@ -826,22 +826,22 @@ void ProjectNode::removeProjectNodes(const QList<ProjectNode*> &subProjects)
ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove); ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove);
auto toRemoveIter = toRemove.constBegin(); auto toRemoveIter = toRemove.constBegin();
auto folderIter = m_subFolderNodes.begin(); auto folderIter = m_folderNodes.begin();
auto projectIter = m_subProjectNodes.begin(); auto projectIter = m_projectNodes.begin();
for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) { for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) {
while (*projectIter != *toRemoveIter) { while (*projectIter != *toRemoveIter) {
++projectIter; ++projectIter;
QTC_ASSERT(projectIter != m_subProjectNodes.end(), QTC_ASSERT(projectIter != m_projectNodes.end(),
qDebug("Project to remove is not part of specified folder!")); qDebug("Project to remove is not part of specified folder!"));
} }
while (*folderIter != *toRemoveIter) { while (*folderIter != *toRemoveIter) {
++folderIter; ++folderIter;
QTC_ASSERT(folderIter != m_subFolderNodes.end(), QTC_ASSERT(folderIter != m_folderNodes.end(),
qDebug("Project to remove is not part of specified folder!")); qDebug("Project to remove is not part of specified folder!"));
} }
delete *projectIter; delete *projectIter;
projectIter = m_subProjectNodes.erase(projectIter); projectIter = m_projectNodes.erase(projectIter);
folderIter = m_subFolderNodes.erase(folderIter); folderIter = m_folderNodes.erase(folderIter);
} }
ProjectTree::instance()->emitFoldersRemoved(this); ProjectTree::instance()->emitFoldersRemoved(this);
@@ -915,11 +915,11 @@ void SessionNode::addProjectNodes(const QList<ProjectNode*> &projectNodes)
QTC_ASSERT(!project->parentFolderNode(), QTC_ASSERT(!project->parentFolderNode(),
qDebug("Project node has already a parent folder")); qDebug("Project node has already a parent folder"));
project->setParentFolderNode(this); project->setParentFolderNode(this);
m_subFolderNodes.append(project); m_folderNodes.append(project);
m_projectNodes.append(project); m_projectNodes.append(project);
} }
Utils::sort(m_subFolderNodes); Utils::sort(m_folderNodes);
Utils::sort(m_projectNodes); Utils::sort(m_projectNodes);
ProjectTree::instance()->emitFoldersAdded(this); ProjectTree::instance()->emitFoldersAdded(this);
@@ -938,7 +938,7 @@ void SessionNode::removeProjectNodes(const QList<ProjectNode*> &projectNodes)
ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove); ProjectTree::instance()->emitFoldersAboutToBeRemoved(this, toRemove);
auto toRemoveIter = toRemove.constBegin(); auto toRemoveIter = toRemove.constBegin();
auto folderIter = m_subFolderNodes.begin(); auto folderIter = m_folderNodes.begin();
auto projectIter = m_projectNodes.begin(); auto projectIter = m_projectNodes.begin();
for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) { for (; toRemoveIter != toRemove.constEnd(); ++toRemoveIter) {
while (*projectIter != *toRemoveIter) { while (*projectIter != *toRemoveIter) {
@@ -948,11 +948,11 @@ void SessionNode::removeProjectNodes(const QList<ProjectNode*> &projectNodes)
} }
while (*folderIter != *toRemoveIter) { while (*folderIter != *toRemoveIter) {
++folderIter; ++folderIter;
QTC_ASSERT(folderIter != m_subFolderNodes.end(), QTC_ASSERT(folderIter != m_folderNodes.end(),
qDebug("Project to remove is not part of specified folder!")); qDebug("Project to remove is not part of specified folder!"));
} }
projectIter = m_projectNodes.erase(projectIter); projectIter = m_projectNodes.erase(projectIter);
folderIter = m_subFolderNodes.erase(folderIter); folderIter = m_folderNodes.erase(folderIter);
} }
ProjectTree::instance()->emitFoldersRemoved(this); ProjectTree::instance()->emitFoldersRemoved(this);

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

@@ -185,8 +185,8 @@ public:
QList<FileNode *> fileNodes() const; QList<FileNode *> fileNodes() const;
QList<FileNode *> recursiveFileNodes() const; QList<FileNode *> recursiveFileNodes() const;
QList<FolderNode *> subFolderNodes() const; QList<FolderNode *> folderNodes() const;
FolderNode *findOrCreateSubFolderNode(const QString &directory); FolderNode *findOrCreateFolderNode(const QString &directory);
void buildTree(QList<FileNode *> &files); void buildTree(QList<FileNode *> &files);
virtual void accept(NodesVisitor *visitor); virtual void accept(NodesVisitor *visitor);
@@ -227,7 +227,7 @@ public:
FolderNode *asFolderNode() override; FolderNode *asFolderNode() override;
protected: protected:
QList<FolderNode*> m_subFolderNodes; QList<FolderNode*> m_folderNodes;
QList<FileNode*> m_fileNodes; QList<FileNode*> m_fileNodes;
private: private:
@@ -255,7 +255,7 @@ public:
QString vcsTopic() const; QString vcsTopic() const;
// all subFolders that are projects // all subFolders that are projects
QList<ProjectNode*> subProjectNodes() const; QList<ProjectNode*> projectNodes() const;
virtual bool canAddSubProject(const QString &proFilePath) const; virtual bool canAddSubProject(const QString &proFilePath) const;
virtual bool addSubProjects(const QStringList &proFilePaths); virtual bool addSubProjects(const QStringList &proFilePaths);
@@ -287,7 +287,7 @@ protected:
explicit ProjectNode(const Utils::FileName &projectFilePath); explicit ProjectNode(const Utils::FileName &projectFilePath);
private: private:
QList<ProjectNode*> m_subProjectNodes; QList<ProjectNode*> m_projectNodes;
// let SessionNode call setParentFolderNode // let SessionNode call setParentFolderNode
friend class SessionNode; friend class SessionNode;

4
src/plugins/projectexplorer/projectwizardpage.cpp
View File

@@ -232,7 +232,7 @@ static inline AddNewTree *createNoneNode(BestNodeSelector *selector)
static inline AddNewTree *buildAddProjectTree(ProjectNode *root, const QString &projectPath, Node *contextNode, BestNodeSelector *selector) static inline AddNewTree *buildAddProjectTree(ProjectNode *root, const QString &projectPath, Node *contextNode, BestNodeSelector *selector)
{ {
QList<AddNewTree *> children; QList<AddNewTree *> children;
foreach (ProjectNode *pn, root->subProjectNodes()) { foreach (ProjectNode *pn, root->projectNodes()) {
AddNewTree *child = buildAddProjectTree(pn, projectPath, contextNode, selector); AddNewTree *child = buildAddProjectTree(pn, projectPath, contextNode, selector);
if (child) if (child)
children.append(child); children.append(child);
@@ -269,7 +269,7 @@ static inline AddNewTree *buildAddFilesTree(FolderNode *root, const QStringList
Node *contextNode, BestNodeSelector *selector) Node *contextNode, BestNodeSelector *selector)
{ {
QList<AddNewTree *> children; QList<AddNewTree *> children;
foreach (FolderNode *fn, root->subFolderNodes()) { foreach (FolderNode *fn, root->folderNodes()) {
AddNewTree *child = buildAddFilesTree(fn, files, contextNode, selector); AddNewTree *child = buildAddFilesTree(fn, files, contextNode, selector);
if (child) if (child)
children.append(child); children.append(child);

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

@@ -475,7 +475,7 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
QList<ProjectExplorer::FileNode *> filesToAdd; QList<ProjectExplorer::FileNode *> filesToAdd;
QList<ProjectExplorer::FolderNode *> foldersToRemove; QList<ProjectExplorer::FolderNode *> foldersToRemove;
foreach (ProjectExplorer::FolderNode *fn, root->subFolderNodes()) { foreach (ProjectExplorer::FolderNode *fn, root->folderNodes()) {
if (fn->nodeType() == ProjectExplorer::NodeType::Project) if (fn->nodeType() == ProjectExplorer::NodeType::Project)
continue; // Skip ProjectNodes mixed into the folders... continue; // Skip ProjectNodes mixed into the folders...
const auto * const qbsFolder = dynamic_cast<QbsFolderNode *>(fn); const auto * const qbsFolder = dynamic_cast<QbsFolderNode *>(fn);
@@ -511,7 +511,7 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
continue; continue;
} else { } else {
ProjectExplorer::FolderNode *fn = 0; ProjectExplorer::FolderNode *fn = 0;
foreach (ProjectExplorer::FolderNode *f, root->subFolderNodes()) { foreach (ProjectExplorer::FolderNode *f, root->folderNodes()) {
// There can be one match only here! // There can be one match only here!
if (f->filePath() != path) if (f->filePath() != path)
continue; continue;
@@ -682,7 +682,7 @@ void QbsProductNode::setQbsProductData(const qbs::Project &project, const qbs::P
prd.location().line()); prd.location().line());
QList<ProjectExplorer::ProjectNode *> toAdd; QList<ProjectExplorer::ProjectNode *> toAdd;
QList<ProjectExplorer::ProjectNode *> toRemove = subProjectNodes(); QList<ProjectExplorer::ProjectNode *> toRemove = projectNodes();
foreach (const qbs::GroupData &grp, prd.groups()) { foreach (const qbs::GroupData &grp, prd.groups()) {
if (grp.name() == prd.name() && grp.location() == prd.location()) { if (grp.name() == prd.name() && grp.location() == prd.location()) {
@@ -736,7 +736,7 @@ QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() c
QbsGroupNode *QbsProductNode::findGroupNode(const QString &name) QbsGroupNode *QbsProductNode::findGroupNode(const QString &name)
{ {
foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) { foreach (ProjectExplorer::ProjectNode *n, projectNodes()) {
QbsGroupNode *qn = static_cast<QbsGroupNode *>(n); QbsGroupNode *qn = static_cast<QbsGroupNode *>(n);
if (qn->qbsGroupData().name() == name) if (qn->qbsGroupData().name() == name)
return qn; return qn;
@@ -762,7 +762,7 @@ QbsProjectNode::~QbsProjectNode()
void QbsProjectNode::update(const qbs::Project &qbsProject, const qbs::ProjectData &prjData) void QbsProjectNode::update(const qbs::Project &qbsProject, const qbs::ProjectData &prjData)
{ {
QList<ProjectExplorer::ProjectNode *> toAdd; QList<ProjectExplorer::ProjectNode *> toAdd;
QList<ProjectExplorer::ProjectNode *> toRemove = subProjectNodes(); QList<ProjectExplorer::ProjectNode *> toRemove = projectNodes();
foreach (const qbs::ProjectData &subData, prjData.subProjects()) { foreach (const qbs::ProjectData &subData, prjData.subProjects()) {
QbsProjectNode *qn = findProjectNode(subData.name()); QbsProjectNode *qn = findProjectNode(subData.name());
@@ -824,7 +824,7 @@ void QbsProjectNode::ctor()
QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName) QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName)
{ {
foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) { foreach (ProjectExplorer::ProjectNode *n, projectNodes()) {
QbsProductNode *qn = dynamic_cast<QbsProductNode *>(n); QbsProductNode *qn = dynamic_cast<QbsProductNode *>(n);
if (qn && QbsProject::uniqueProductName(qn->qbsProductData()) == uniqueName) if (qn && QbsProject::uniqueProductName(qn->qbsProductData()) == uniqueName)
return qn; return qn;
@@ -834,7 +834,7 @@ QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName)
QbsProjectNode *QbsProjectNode::findProjectNode(const QString &name) QbsProjectNode *QbsProjectNode::findProjectNode(const QString &name)
{ {
foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) { foreach (ProjectExplorer::ProjectNode *n, projectNodes()) {
QbsProjectNode *qn = dynamic_cast<QbsProjectNode *>(n); QbsProjectNode *qn = dynamic_cast<QbsProjectNode *>(n);
if (qn && qn->qbsProjectData().name() == name) if (qn && qn->qbsProjectData().name() == name)
return qn; return qn;

28
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -447,7 +447,7 @@ struct InternalNode
// updateFolders // updateFolders
QMultiMap<QString, FolderNode *> existingFolderNodes; QMultiMap<QString, FolderNode *> existingFolderNodes;
foreach (FolderNode *node, folder->subFolderNodes()) foreach (FolderNode *node, folder->folderNodes())
if (node->nodeType() != NodeType::Project && !dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node)) if (node->nodeType() != NodeType::Project && !dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node))
existingFolderNodes.insert(node->filePath().toString(), node); existingFolderNodes.insert(node->filePath().toString(), node);
@@ -560,7 +560,7 @@ struct InternalNode
void updateResourceFiles(FolderNode *folder) void updateResourceFiles(FolderNode *folder)
{ {
QList<FolderNode *> existingResourceNodes; // for resource special handling QList<FolderNode *> existingResourceNodes; // for resource special handling
foreach (FolderNode *folderNode, folder->subFolderNodes()) { foreach (FolderNode *folderNode, folder->folderNodes()) {
if (ResourceEditor::ResourceTopLevelNode *rn = dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode)) if (ResourceEditor::ResourceTopLevelNode *rn = dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
existingResourceNodes << rn; existingResourceNodes << rn;
} }
@@ -855,7 +855,7 @@ QList<RunConfiguration *> QmakePriFileNode::runConfigurations() const
QList<QmakePriFileNode *> QmakePriFileNode::subProjectNodesExact() const QList<QmakePriFileNode *> QmakePriFileNode::subProjectNodesExact() const
{ {
QList<QmakePriFileNode *> nodes; QList<QmakePriFileNode *> nodes;
foreach (ProjectNode *node, subProjectNodes()) { foreach (ProjectNode *node, projectNodes()) {
QmakePriFileNode *n = dynamic_cast<QmakePriFileNode *>(node); QmakePriFileNode *n = dynamic_cast<QmakePriFileNode *>(node);
if (n && n->includedInExactParse()) if (n && n->includedInExactParse())
nodes << n; nodes << n;
@@ -909,7 +909,7 @@ QList<ProjectAction> QmakePriFileNode::supportedActions(Node *node) const
FolderNode *folder = node->asFolderNode(); FolderNode *folder = node->asFolderNode();
if (folder) { if (folder) {
QStringList list; QStringList list;
foreach (FolderNode *f, folder->subFolderNodes()) foreach (FolderNode *f, folder->folderNodes())
list << f->filePath().toString() + QLatin1Char('/'); list << f->filePath().toString() + QLatin1Char('/');
if (deploysFolder(Utils::commonPath(list))) if (deploysFolder(Utils::commonPath(list)))
addExistingFiles = false; addExistingFiles = false;
@@ -1543,7 +1543,7 @@ QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) con
{ {
if (fileName == filePath()) if (fileName == filePath())
return const_cast<QmakeProFileNode *>(this); return const_cast<QmakeProFileNode *>(this);
foreach (ProjectNode *pn, subProjectNodes()) foreach (ProjectNode *pn, projectNodes())
if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(pn)) if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(pn))
if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName)) if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName))
return result; return result;
@@ -1677,7 +1677,7 @@ void QmakeProFileNode::emitProFileUpdatedRecursive()
{ {
emit m_project->proFileUpdated(this, m_validParse, m_parseInProgress); emit m_project->proFileUpdated(this, m_validParse, m_parseInProgress);
foreach (ProjectNode *subNode, subProjectNodes()) { foreach (ProjectNode *subNode, projectNodes()) {
if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode)) if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode))
node->emitProFileUpdatedRecursive(); node->emitProFileUpdatedRecursive();
} }
@@ -1686,7 +1686,7 @@ void QmakeProFileNode::emitProFileUpdatedRecursive()
void QmakeProFileNode::setParseInProgressRecursive(bool b) void QmakeProFileNode::setParseInProgressRecursive(bool b)
{ {
setParseInProgress(b); setParseInProgress(b);
foreach (ProjectNode *subNode, subProjectNodes()) { foreach (ProjectNode *subNode, projectNodes()) {
if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode)) if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode))
node->setParseInProgressRecursive(b); node->setParseInProgressRecursive(b);
} }
@@ -1703,7 +1703,7 @@ void QmakeProFileNode::setParseInProgress(bool b)
void QmakeProFileNode::setValidParseRecursive(bool b) void QmakeProFileNode::setValidParseRecursive(bool b)
{ {
setValidParse(b); setValidParse(b);
foreach (ProjectNode *subNode, subProjectNodes()) { foreach (ProjectNode *subNode, projectNodes()) {
if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode)) if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode))
node->setValidParseRecursive(b); node->setValidParseRecursive(b);
} }
@@ -2062,8 +2062,8 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
// delete files && folders && projects // delete files && folders && projects
removeFileNodes(fileNodes()); removeFileNodes(fileNodes());
removeProjectNodes(subProjectNodes()); removeProjectNodes(projectNodes());
removeFolderNodes(subFolderNodes()); removeFolderNodes(folderNodes());
m_projectType = InvalidProject; m_projectType = InvalidProject;
} }
@@ -2076,7 +2076,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
if (result->projectType != m_projectType) { if (result->projectType != m_projectType) {
// probably all subfiles/projects have changed anyway // probably all subfiles/projects have changed anyway
// delete files && folders && projects // delete files && folders && projects
foreach (ProjectNode *projectNode, subProjectNodes()) { foreach (ProjectNode *projectNode, projectNodes()) {
if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(projectNode)) { if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(projectNode)) {
qmakeProFileNode->setValidParseRecursive(false); qmakeProFileNode->setValidParseRecursive(false);
qmakeProFileNode->setParseInProgressRecursive(false); qmakeProFileNode->setParseInProgressRecursive(false);
@@ -2084,8 +2084,8 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
} }
removeFileNodes(fileNodes()); removeFileNodes(fileNodes());
removeProjectNodes(subProjectNodes()); removeProjectNodes(projectNodes());
removeFolderNodes(subFolderNodes()); removeFolderNodes(folderNodes());
bool changesShowInSimpleTree = showInSimpleTree() ^ showInSimpleTree(result->projectType); bool changesShowInSimpleTree = showInSimpleTree() ^ showInSimpleTree(result->projectType);
@@ -2114,7 +2114,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
IncludedPriFile *tree = toCompare.first().second; IncludedPriFile *tree = toCompare.first().second;
toCompare.pop_front(); toCompare.pop_front();
QList<ProjectNode*> existingProjectNodes = pn->subProjectNodes(); QList<ProjectNode*> existingProjectNodes = pn->projectNodes();
Utils::sort(existingProjectNodes, sortByPath); Utils::sort(existingProjectNodes, sortByPath);
// result is already sorted // result is already sorted

8
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -840,7 +840,7 @@ static FolderNode *folderOf(FolderNode *in, const FileName &fileName)
foreach (FileNode *fn, in->fileNodes()) foreach (FileNode *fn, in->fileNodes())
if (fn->filePath() == fileName) if (fn->filePath() == fileName)
return in; return in;
foreach (FolderNode *folder, in->subFolderNodes()) foreach (FolderNode *folder, in->folderNodes())
if (FolderNode *pn = folderOf(folder, fileName)) if (FolderNode *pn = folderOf(folder, fileName))
return pn; return pn;
return 0; return 0;
@@ -1002,7 +1002,7 @@ void QmakeProject::collectAllProFiles(QList<QmakeProFileNode *> &list, QmakeProF
if (parse == ExactAndCumulativeParse || node->includedInExactParse()) if (parse == ExactAndCumulativeParse || node->includedInExactParse())
if (projectTypes.isEmpty() || projectTypes.contains(node->projectType())) if (projectTypes.isEmpty() || projectTypes.contains(node->projectType()))
list.append(node); list.append(node);
foreach (ProjectNode *n, node->subProjectNodes()) { foreach (ProjectNode *n, node->projectNodes()) {
QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(n); QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(n);
if (qmakeProFileNode) if (qmakeProFileNode)
collectAllProFiles(list, qmakeProFileNode, parse, projectTypes); collectAllProFiles(list, qmakeProFileNode, parse, projectTypes);
@@ -1075,7 +1075,7 @@ bool QmakeProject::hasSubNode(QmakePriFileNode *root, const FileName &path)
{ {
if (root->filePath() == path) if (root->filePath() == path)
return true; return true;
foreach (FolderNode *fn, root->subFolderNodes()) { foreach (FolderNode *fn, root->folderNodes()) {
if (dynamic_cast<QmakeProFileNode *>(fn)) { if (dynamic_cast<QmakeProFileNode *>(fn)) {
// we aren't interested in pro file nodes // we aren't interested in pro file nodes
} else if (QmakePriFileNode *qt4prifilenode = dynamic_cast<QmakePriFileNode *>(fn)) { } else if (QmakePriFileNode *qt4prifilenode = dynamic_cast<QmakePriFileNode *>(fn)) {
@@ -1091,7 +1091,7 @@ void QmakeProject::findProFile(const FileName &fileName, QmakeProFileNode *root,
if (hasSubNode(root, fileName)) if (hasSubNode(root, fileName))
list.append(root); list.append(root);
foreach (FolderNode *fn, root->subFolderNodes()) foreach (FolderNode *fn, root->folderNodes())
if (QmakeProFileNode *qt4proFileNode = dynamic_cast<QmakeProFileNode *>(fn)) if (QmakeProFileNode *qt4proFileNode = dynamic_cast<QmakeProFileNode *>(fn))
findProFile(fileName, qt4proFileNode, list); findProFile(fileName, qt4proFileNode, list);
} }

4
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -387,8 +387,8 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists,
if (node->nodeType() == ProjectExplorer::NodeType::VirtualFolder && node->displayName() == "Resources") { if (node->nodeType() == ProjectExplorer::NodeType::VirtualFolder && node->displayName() == "Resources") {
ProjectExplorer::VirtualFolderNode *virtualFolderNode = dynamic_cast<ProjectExplorer::VirtualFolderNode*>(node); ProjectExplorer::VirtualFolderNode *virtualFolderNode = dynamic_cast<ProjectExplorer::VirtualFolderNode*>(node);
for (int subFolderIndex = 0; subFolderIndex < virtualFolderNode->subFolderNodes().size() && !iconQrcFileNode; ++subFolderIndex) { for (int subFolderIndex = 0; subFolderIndex < virtualFolderNode->folderNodes().size() && !iconQrcFileNode; ++subFolderIndex) {
ProjectExplorer::FolderNode *subFolderNode = virtualFolderNode->subFolderNodes().at(subFolderIndex); ProjectExplorer::FolderNode *subFolderNode = virtualFolderNode->folderNodes().at(subFolderIndex);
qCDebug(documentManagerLog) << "Checking if" << subFolderNode->displayName() << "(" qCDebug(documentManagerLog) << "Checking if" << subFolderNode->displayName() << "("
<< subFolderNode << static_cast<int>(subFolderNode->nodeType()) << subFolderNode << static_cast<int>(subFolderNode->nodeType())

12
src/plugins/resourceeditor/resourcenode.cpp
View File

@@ -226,7 +226,7 @@ void ResourceTopLevelNode::update()
} }
QList<ProjectExplorer::FolderNode *> oldPrefixList = subFolderNodes(); QList<ProjectExplorer::FolderNode *> oldPrefixList = folderNodes();
QList<ProjectExplorer::FolderNode *> prefixesToAdd; QList<ProjectExplorer::FolderNode *> prefixesToAdd;
QList<ProjectExplorer::FolderNode *> prefixesToRemove; QList<ProjectExplorer::FolderNode *> prefixesToRemove;
@@ -242,12 +242,12 @@ void ResourceTopLevelNode::update()
// delete nodes that weren't added // delete nodes that weren't added
qDeleteAll(ProjectExplorer::subtractSortedList(newPrefixList, prefixesToAdd, sortByPrefixAndLang)); qDeleteAll(ProjectExplorer::subtractSortedList(newPrefixList, prefixesToAdd, sortByPrefixAndLang));
foreach (FolderNode *sfn, subFolderNodes()) { foreach (FolderNode *sfn, folderNodes()) {
ResourceFolderNode *srn = static_cast<ResourceFolderNode *>(sfn); ResourceFolderNode *srn = static_cast<ResourceFolderNode *>(sfn);
PrefixFolderLang folderId(srn->prefix(), QString(), srn->lang()); PrefixFolderLang folderId(srn->prefix(), QString(), srn->lang());
srn->updateFiles(filesToAdd[folderId]); srn->updateFiles(filesToAdd[folderId]);
srn->updateFolders(foldersToAddToPrefix[folderId]); srn->updateFolders(foldersToAddToPrefix[folderId]);
foreach (FolderNode* ssfn, sfn->subFolderNodes()) { foreach (FolderNode* ssfn, sfn->folderNodes()) {
SimpleResourceFolderNode *sssn = static_cast<SimpleResourceFolderNode *>(ssfn); SimpleResourceFolderNode *sssn = static_cast<SimpleResourceFolderNode *>(ssfn);
sssn->addFilesAndSubfolders(filesToAdd, foldersToAddToFolders, srn->prefix(), srn->lang()); sssn->addFilesAndSubfolders(filesToAdd, foldersToAddToFolders, srn->prefix(), srn->lang());
} }
@@ -552,7 +552,7 @@ void ResourceFolderNode::updateFiles(QList<ProjectExplorer::FileNode *> newList)
void ResourceFolderNode::updateFolders(QList<ProjectExplorer::FolderNode *> newList) void ResourceFolderNode::updateFolders(QList<ProjectExplorer::FolderNode *> newList)
{ {
QList<ProjectExplorer::FolderNode *> oldList = subFolderNodes(); QList<ProjectExplorer::FolderNode *> oldList = folderNodes();
QList<ProjectExplorer::FolderNode *> foldersToAdd; QList<ProjectExplorer::FolderNode *> foldersToAdd;
QList<ProjectExplorer::FolderNode *> foldersToRemove; QList<ProjectExplorer::FolderNode *> foldersToRemove;
@@ -737,7 +737,7 @@ void SimpleResourceFolderNode::updateFiles(QList<ProjectExplorer::FileNode *> ne
void SimpleResourceFolderNode::updateFolders(QList<ProjectExplorer::FolderNode *> newList) void SimpleResourceFolderNode::updateFolders(QList<ProjectExplorer::FolderNode *> newList)
{ {
QList<ProjectExplorer::FolderNode *> oldList = subFolderNodes(); QList<ProjectExplorer::FolderNode *> oldList = folderNodes();
QList<ProjectExplorer::FolderNode *> foldersToAdd; QList<ProjectExplorer::FolderNode *> foldersToAdd;
QList<ProjectExplorer::FolderNode *> foldersToRemove; QList<ProjectExplorer::FolderNode *> foldersToRemove;
@@ -761,7 +761,7 @@ void SimpleResourceFolderNode::addFilesAndSubfolders(QMap<PrefixFolderLang,
{ {
updateFiles(filesToAdd.value(PrefixFolderLang(prefix, m_folderName, lang))); updateFiles(filesToAdd.value(PrefixFolderLang(prefix, m_folderName, lang)));
updateFolders(foldersToAdd.value(PrefixFolderLang(prefix, m_folderName, lang))); updateFolders(foldersToAdd.value(PrefixFolderLang(prefix, m_folderName, lang)));
foreach (FolderNode* subNode, subFolderNodes()) { foreach (FolderNode* subNode, folderNodes()) {
SimpleResourceFolderNode* sn = static_cast<SimpleResourceFolderNode*>(subNode); SimpleResourceFolderNode* sn = static_cast<SimpleResourceFolderNode*>(subNode);
sn->addFilesAndSubfolders(filesToAdd, foldersToAdd, prefix, lang); sn->addFilesAndSubfolders(filesToAdd, foldersToAdd, prefix, lang);
} }