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

SessionManager: Apply 'static' pattern

Browse Source 
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-09-05 11:46:07 +02:00
parent dab9886ebf
commit aadb6f16af
58 changed files with 545 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/classview/classviewparser.cpp
View File

@@ -58,6 +58,8 @@
enum { debug = false };
using namespace ProjectExplorer;
namespace ClassView {
namespace Internal {
@@ -274,8 +276,7 @@ ParserTreeItem::ConstPtr Parser::parse()
ParserTreeItem::Ptr rootItem(new ParserTreeItem());
// check all projects
QList<ProjectExplorer::Project *> projects = getProjectList();
foreach (const ProjectExplorer::Project *prj, projects) {
foreach (const Project *prj, SessionManager::projects()) {
if (!prj)
continue;
@@ -293,7 +294,7 @@ ParserTreeItem::ConstPtr Parser::parse()
if (d->flatMode) {
// use prj path (prjType) as a project id
// addProject(item, prj->files(ProjectExplorer::Project::ExcludeGeneratedFiles), prjType);
// addProject(item, prj->files(Project::ExcludeGeneratedFiles), prjType);
//! \todo return back, works too long
ParserTreeItem::Ptr flatItem = createFlatTree(projectList);
item.swap(flatItem);
@@ -673,10 +674,9 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot)
QStringList fileList;
// check all projects
QList<ProjectExplorer::Project *> projects = getProjectList();
foreach (const ProjectExplorer::Project *prj, projects) {
foreach (const Project *prj, SessionManager::projects()) {
if (prj)
fileList += prj->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
fileList += prj->files(Project::ExcludeGeneratedFiles);
}
setFileList(fileList);
@@ -819,22 +819,5 @@ QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item,
return projectList;
}
/*!
Returns the current project list.
*/
QList<ProjectExplorer::Project *> Parser::getProjectList() const
{
QList<ProjectExplorer::Project *> list;
// check all projects
ProjectExplorer::SessionManager *sessionManager
= ProjectExplorer::ProjectExplorerPlugin::instance()->session();
list = sessionManager->projects();
return list;
}
} // namespace Internal
} // namespace ClassView