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

Completely rework currentNode/currentProject handling

Browse Source 
Centralize the handling inside a new class ProjectTree.
React to moving focus and remove most special handling.

This properly fixes the linked task.

Task-number: QTCREATORBUG-13357
Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-11-19 17:58:33 +01:00
parent 042ef1aec0
commit 4943510b60
43 changed files with 744 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/plugins/projectexplorer/session.cpp
View File

@@ -536,6 +536,26 @@ QList<Project *> SessionManager::projectOrder(Project *project)
return result;
}
QList<Node *> SessionManager::nodesForFile(const QString &fileName)
{
FindNodesForFileVisitor findNodes(fileName);
sessionNode()->accept(&findNodes);
return findNodes.nodes();
}
// node for file returns a randomly selected node if there are multiple
// prefer to use nodesForFile and figure out which node you want
Node *SessionManager::nodeForFile(const QString &fileName)
{
Node *node = 0;
foreach (Node *n, nodesForFile(fileName)) {
// prefer file nodes
if (!node || (node->nodeType() != FileNodeType && n->nodeType() == FileNodeType))
node = n;
}
return node;
}
Project *SessionManager::projectForNode(Node *node)
{
if (!node)
@@ -553,47 +573,14 @@ Project *SessionManager::projectForNode(Node *node)
return Utils::findOrDefault(d->m_projects, Utils::equal(&Project::rootProjectNode, rootProjectNode));
}
QList<Node *> SessionManager::nodesForFile(const QString &fileName, Project *project)
{
if (!project)
project = projectForFile(fileName);
if (project) {
FindNodesForFileVisitor findNodes(fileName);
project->rootProjectNode()->accept(&findNodes);
return findNodes.nodes();
}
return QList<Node *>();
}
// node for file returns a randomly selected node if there are multiple
// prefer to use nodesForFile and figure out which node you want
Node *SessionManager::nodeForFile(const QString &fileName, Project *project)
{
Node *node = 0;
foreach (Node *n, nodesForFile(fileName, project)) {
// prefer file nodes
if (!node || (node->nodeType() != FileNodeType && n->nodeType() == FileNodeType))
node = n;
}
return node;
}
Project *SessionManager::projectForFile(const QString &fileName)
{
if (debug)
qDebug() << "SessionManager::projectForFile(" << fileName << ")";
const QList<Project *> &projectList = projects();
// Check current project first
Project *currentProject = ProjectExplorerPlugin::currentProject();
if (currentProject && d->projectContainsFile(currentProject, fileName))
return currentProject;
foreach (Project *p, projectList)
if (p != currentProject && d->projectContainsFile(p, fileName))
if (d->projectContainsFile(p, fileName))
return p;
return 0;
@@ -1023,15 +1010,7 @@ void SessionManager::projectDisplayNameChanged()
{
Project *pro = qobject_cast<Project*>(m_instance->sender());
if (pro) {
Node *currentNode = 0;
if (ProjectExplorerPlugin::currentProject() == pro)
currentNode = ProjectExplorerPlugin::currentNode();
d->m_sessionNode->projectDisplayNameChanged(pro->rootProjectNode());
if (currentNode)
ProjectExplorerPlugin::setCurrentNode(currentNode);
emit m_instance->projectDisplayNameChanged(pro);
}
}