diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index a07d42d03ba..bb899b2d184 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -135,20 +135,6 @@ void ProjectTree::focusChanged() s_instance->updateFromFocus(); } -bool ProjectTree::editorHasFocus() -{ - Core::IEditor *editor = Core::EditorManager::currentEditor(); - if (!editor) - return false; - QWidget *widget = editor->widget(); - if (!widget) - return false; - widget = widget->focusWidget(); - if (!widget) - return false; - return widget->hasFocus(); -} - void ProjectTree::updateFromFocus(bool invalidCurrentNode) { ProjectTreeWidget *focus = Utils::findOrDefault(s_instance->m_projectTreeWidgets, @@ -156,7 +142,7 @@ void ProjectTree::updateFromFocus(bool invalidCurrentNode) if (focus) updateFromProjectTreeWidget(focus); - else if (editorHasFocus()) + else updateFromDocumentManager(invalidCurrentNode); } @@ -170,8 +156,7 @@ void ProjectTree::updateFromProjectTreeWidget(ProjectTreeWidget *widget) void ProjectTree::documentManagerCurrentFileChanged() { - if (editorHasFocus()) - updateFromDocumentManager(); + updateFromFocus(); } Project *ProjectTree::projectForNode(Node *node) diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h index 4a4c9d8da0c..b9ac7473e9c 100644 --- a/src/plugins/projectexplorer/projecttree.h +++ b/src/plugins/projectexplorer/projecttree.h @@ -89,7 +89,6 @@ private: void updateFromFocus(bool invalidCurrentNode = false); void updateExternalFileWarning(); - bool editorHasFocus(); static bool hasFocus(Internal::ProjectTreeWidget *widget);