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

19
src/plugins/projectexplorer/projecttree.h
View File

@@ -35,18 +35,13 @@
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <QObject>
namespace ProjectExplorer { namespace ProjectExplorer {
class FileNode; class FileNode;
class FolderNode; class FolderNode;
class Node; class Node;
class Project; class Project;
class ProjectNode;
namespace Internal { namespace Internal { class ProjectTreeWidget; }
class ProjectTreeWidget;
}
class PROJECTEXPLORER_EXPORT ProjectTree : public QObject class PROJECTEXPLORER_EXPORT ProjectTree : public QObject
{ {
@@ -60,9 +55,9 @@ public:
static Node *currentNode(); static Node *currentNode();
// Integration with ProjectTreeWidget // Integration with ProjectTreeWidget
static void registerWidget(ProjectExplorer::Internal::ProjectTreeWidget *widget); static void registerWidget(Internal::ProjectTreeWidget *widget);
static void unregisterWidget(ProjectExplorer::Internal::ProjectTreeWidget *widget); static void unregisterWidget(Internal::ProjectTreeWidget *widget);
static void nodeChanged(ProjectExplorer::Internal::ProjectTreeWidget *widget); static void nodeChanged(Internal::ProjectTreeWidget *widget);
static void focusChanged(); static void focusChanged();
static Project *projectForNode(Node *node); static Project *projectForNode(Node *node);
@@ -71,7 +66,7 @@ signals:
void currentNodeChanged(ProjectExplorer::Node *node, ProjectExplorer::Project *project); void currentNodeChanged(ProjectExplorer::Node *node, ProjectExplorer::Project *project);
private: private:
void updateFromProjectTreeWidget(ProjectExplorer::Internal::ProjectTreeWidget *widget); void updateFromProjectTreeWidget(Internal::ProjectTreeWidget *widget);
void documentManagerCurrentFileChanged(); void documentManagerCurrentFileChanged();
void updateFromDocumentManager(bool invalidCurrentNode = false); void updateFromDocumentManager(bool invalidCurrentNode = false);
void update(Node *node, Project *project); void update(Node *node, Project *project);
@@ -82,7 +77,7 @@ private:
void foldersRemoved(); void foldersRemoved();
void filesAboutToBeRemoved(FolderNode *, const QList<FileNode *> &list); void filesAboutToBeRemoved(FolderNode *, const QList<FileNode *> &list);
void filesRemoved(); void filesRemoved();
void aboutToRemoveProject(ProjectExplorer::Project *project); void aboutToRemoveProject(Project *project);
void projectRemoved(); void projectRemoved();
void nodesAdded(); void nodesAdded();
@@ -93,7 +88,7 @@ private:
static ProjectTree *s_instance; static ProjectTree *s_instance;
QList<ProjectExplorer::Internal::ProjectTreeWidget *> m_projectTreeWidgets; QList<Internal::ProjectTreeWidget *> m_projectTreeWidgets;
Node *m_currentNode; Node *m_currentNode;
Project *m_currentProject; Project *m_currentProject;
bool m_resetCurrentNodeFolder; bool m_resetCurrentNodeFolder;