diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index 1ec856c6514..376dc73d7f1 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -149,7 +149,7 @@ void ProjectTree::updateFromFocus(bool invalidCurrentNode) void ProjectTree::updateFromProjectTreeWidget(ProjectTreeWidget *widget) { Node *currentNode = widget->currentNode(); - Project *project = projectForNode(currentNode); + Project *project = SessionManager::projectForNode(currentNode); update(currentNode, project); } @@ -159,23 +159,6 @@ void ProjectTree::documentManagerCurrentFileChanged() updateFromFocus(); } -Project *ProjectTree::projectForNode(Node *node) -{ - if (!node) - return nullptr; - - FolderNode *rootProjectNode = node->asFolderNode(); - if (!rootProjectNode) - rootProjectNode = node->parentFolderNode(); - - while (rootProjectNode && rootProjectNode->parentFolderNode() != SessionManager::sessionNode()) - rootProjectNode = rootProjectNode->parentFolderNode(); - - Q_ASSERT(rootProjectNode); - - return Utils::findOrDefault(SessionManager::projects(), Utils::equal(&Project::rootProjectNode, rootProjectNode)); -} - void ProjectTree::updateFromDocumentManager(bool invalidCurrentNode) { Core::IDocument *document = Core::EditorManager::currentDocument(); @@ -194,7 +177,7 @@ void ProjectTree::updateFromNode(Node *node) { Project *project; if (node) - project = projectForNode(node); + project = SessionManager::projectForNode(node); else project = SessionManager::startupProject(); diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h index cd1ec25ef85..196e280c142 100644 --- a/src/plugins/projectexplorer/projecttree.h +++ b/src/plugins/projectexplorer/projecttree.h @@ -55,7 +55,6 @@ public: static void registerWidget(Internal::ProjectTreeWidget *widget); static void unregisterWidget(Internal::ProjectTreeWidget *widget); static void nodeChanged(Internal::ProjectTreeWidget *widget); - static Project *projectForNode(Node *node); static void aboutToShutDown();