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

Clean up ProjectTree

Browse Source 
Denoise namespaces, remove redudant QObject include access to static
instance in nonstatic method

Change-Id: Ic54cd0da90e72a981394996fccd74053a11352e0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikita Baryshnikov
2014-12-09 00:15:43 +03:00
committed by hjk
parent e8396f4c8d
commit 74c0409d35
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/projecttree.cpp
View File

@@ -137,7 +137,7 @@ void ProjectTree::focusChanged()
void ProjectTree::updateFromFocus(bool invalidCurrentNode)
{
ProjectTreeWidget *focus = Utils::findOrDefault(s_instance->m_projectTreeWidgets,
ProjectTreeWidget *focus = Utils::findOrDefault(m_projectTreeWidgets,
&ProjectTree::hasFocus);
if (focus)
@@ -148,8 +148,8 @@ void ProjectTree::updateFromFocus(bool invalidCurrentNode)
void ProjectTree::updateFromProjectTreeWidget(ProjectTreeWidget *widget)
{
ProjectExplorer::Node *currentNode = widget->currentNode();
ProjectExplorer::Project *project = projectForNode(currentNode);
Node *currentNode = widget->currentNode();
Project *project = projectForNode(currentNode);
update(currentNode, project);
}
@@ -180,13 +180,13 @@ void ProjectTree::updateFromDocumentManager(bool invalidCurrentNode)
{
const QString &fileName = Core::DocumentManager::currentFile();
ProjectExplorer::Node *currentNode = 0;
Node *currentNode = 0;
if (!invalidCurrentNode && m_currentNode && m_currentNode->path() == fileName)
currentNode = m_currentNode;
else
currentNode = ProjectTreeWidget::nodeForFile(fileName);
ProjectExplorer::Project *project = projectForNode(currentNode);
Project *project = projectForNode(currentNode);
update(currentNode, project);
foreach (ProjectTreeWidget *widget, m_projectTreeWidgets)
@@ -339,7 +339,7 @@ void ProjectTree::updateExternalFileWarning()
Core::InfoBarEntry::GlobalSuppressionEnabled));
}
bool ProjectExplorer::ProjectTree::hasFocus(ProjectExplorer::Internal::ProjectTreeWidget *widget)
bool ProjectTree::hasFocus(ProjectTreeWidget *widget)
{
return widget && widget->focusWidget() && widget->focusWidget()->hasFocus();
}