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

6
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -273,8 +273,7 @@ void ModelManager::delayedInitialization()
this, SLOT(maybeQueueCppQmlTypeUpdate(CPlusPlus::Document::Ptr)), Qt::DirectConnection);
}
ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session();
connect(sessionManager, SIGNAL(projectRemoved(ProjectExplorer::Project*)),
connect(ProjectExplorer::SessionManager::instance(), SIGNAL(projectRemoved(ProjectExplorer::Project*)),
this, SLOT(removeProjectInfo(ProjectExplorer::Project*)));
}
@@ -1111,8 +1110,7 @@ ModelManager::CppDataHash ModelManager::cppData() const
LibraryInfo ModelManager::builtins(const Document::Ptr &doc) const
{
ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session();
ProjectExplorer::Project *project = sessionManager->projectForFile(doc->fileName());
ProjectExplorer::Project *project = ProjectExplorer::SessionManager::projectForFile(doc->fileName());
if (!project)
return LibraryInfo();

4
src/plugins/qmljstools/qmljsplugindumper.cpp
View File

@@ -31,7 +31,7 @@
#include "qmljsmodelmanager.h"
#include <qmljs/qmljsinterpreter.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <coreplugin/messagemanager.h>
#include <utils/filesystemwatcher.h>
#include <utils/fileutils.h>
@@ -437,7 +437,7 @@ void PluginDumper::dump(const Plugin &plugin)
return;
}
ProjectExplorer::Project *activeProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
ProjectExplorer::Project *activeProject = ProjectExplorer::SessionManager::startupProject();
if (!activeProject)
return;