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

ProjectExplorer: Remove ProjectNode::m_projectNodes

Browse Source 
They are duplicated in m_folderNodes, use them.

Change-Id: I4571720f1ef3daf098870a3cf05fa28a1002bb3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
hjk
2017-02-07 13:49:37 +01:00
parent c985914bde
commit 95e2d7f545
8 changed files with 35 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,11 +161,9 @@ class ProjectFilesVisitor : public NodesVisitor
ProjectFilesVisitor(QmakeProjectFiles *files);
public:
static void findProjectFiles(QmakeProFileNode *rootNode, QmakeProjectFiles *files);
void visitProjectNode(ProjectNode *projectNode);
void visitFolderNode(FolderNode *folderNode);
void visitFolderNode(FolderNode *folderNode) final;
private:
QmakeProjectFiles *m_files;
@@ -199,14 +197,10 @@ void ProjectFilesVisitor::findProjectFiles(QmakeProFileNode *rootNode, QmakeProj
unique(files->proFiles);
}
void ProjectFilesVisitor::visitProjectNode(ProjectNode *projectNode)
{
m_files->proFiles.append(projectNode->filePath().toString());
visitFolderNode(projectNode);
}
void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode)
{
if (ProjectNode *projectNode = folderNode->asProjectNode())
m_files->proFiles.append(projectNode->filePath().toString());
if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
m_files->files[static_cast<int>(FileType::Resource)].push_back(folderNode->filePath().toString());