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

ProjectNodes: Move (add|remove)(File|Folder)Node to FolderNode

Browse Source 
The reason they were on ProjectNode is that the signals are emitted
on the projectnode, but since I moved addFiles and others to FolderNode,
this makes more sense.

Change-Id: I918ca4d93dab78c8bb93dff03f53d1a6fbe21340
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2014-02-18 19:49:55 +01:00
parent a6b6a99d62
commit d809037302
8 changed files with 210 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
View File

@@ -69,8 +69,8 @@ void QmlProjectNode::refresh()
using namespace ProjectExplorer;
// remove the existing nodes.
removeFileNodes(fileNodes(), this);
removeFolderNodes(subFolderNodes(), this);
removeFileNodes(fileNodes());
removeFolderNodes(subFolderNodes());
//ProjectExplorerPlugin::instance()->setCurrentNode(0); // ### remove me
@@ -82,8 +82,7 @@ void QmlProjectNode::refresh()
files.removeAll(m_project->filesFileName());
addFileNodes(QList<FileNode *>()
<< projectFilesNode,
this);
<< projectFilesNode);
QHash<QString, QStringList> filesInDirectory;
@@ -118,7 +117,7 @@ void QmlProjectNode::refresh()
fileNodes.append(fileNode);
}
addFileNodes(fileNodes, folder);
folder->addFileNodes(fileNodes);
}
m_folderByName.clear();
@@ -154,7 +153,7 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
if (! parent)
parent = this;
addFolderNodes(QList<FolderNode*>() << folder, parent);
parent->addFolderNodes(QList<FolderNode*>() << folder);
return folder;
}