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

14
src/plugins/designer/resourcehandler.cpp
View File

@@ -45,10 +45,7 @@
#include <utils/qtcassert.h>
using ProjectExplorer::NodesVisitor;
using ProjectExplorer::ProjectNode;
using ProjectExplorer::FolderNode;
using ProjectExplorer::FileNode;
using namespace ProjectExplorer;
namespace Designer {
namespace Internal {
@@ -100,8 +97,8 @@ void ResourceHandler::ensureInitialized()
{
if (m_sessionNode)
return;
ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance();
m_sessionNode = pe->session()->sessionNode();
m_sessionNode = ProjectExplorer::SessionManager::sessionNode();
m_sessionWatcher = new ProjectExplorer::NodesWatcher();
connect(m_sessionWatcher, SIGNAL(filesAdded()), this, SLOT(updateResources()));
@@ -137,9 +134,8 @@ void ResourceHandler::updateResources()
if (Designer::Constants::Internal::debug)
qDebug() << "ResourceHandler::updateResources()" << fileName;
ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance();
// filename could change in the meantime.
ProjectExplorer::Project *project = pe->session()->projectForFile(fileName);
// Filename could change in the meantime.
Project *project = SessionManager::projectForFile(fileName);
// Does the file belong to a project?
if (project) {