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

15
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -60,6 +60,8 @@
#include <QAction>
#include <QtPlugin>
using namespace ProjectExplorer;
namespace QbsProjectManager {
namespace Internal {
@@ -239,10 +241,8 @@ void QbsProjectManagerPlugin::updateBuildActions()
if (Core::IDocument *currentDocument= Core::EditorManager::currentDocument()) {
file = currentDocument->filePath();
ProjectExplorer::SessionManager *session = m_projectExplorer->session();
ProjectExplorer::Node *node = session->nodeForFile(file);
ProjectExplorer::Project *project
= qobject_cast<QbsProject *>(session->projectForFile(file));
Node *node = SessionManager::nodeForFile(file);
Project *project = qobject_cast<QbsProject *>(SessionManager::projectForFile(file));
m_buildFile->setParameter(QFileInfo(file).fileName());
fileVisible = project && node && qobject_cast<QbsBaseProjectNode *>(node->projectNode());
@@ -310,7 +310,7 @@ void QbsProjectManagerPlugin::buildFile()
QbsProject *project = 0;
if (Core::IDocument *currentDocument= Core::EditorManager::currentDocument()) {
file = currentDocument->filePath();
project = qobject_cast<QbsProject *>(m_projectExplorer->session()->projectForFile(file));
project = qobject_cast<QbsProject *>(SessionManager::projectForFile(file));
}
if (!project || file.isEmpty())
@@ -333,10 +333,9 @@ void QbsProjectManagerPlugin::buildProduct()
QbsProductNode *product = 0;
if (Core::IDocument *currentDocument= Core::EditorManager::currentDocument()) {
const QString file = currentDocument->filePath();
ProjectExplorer::SessionManager *session = m_projectExplorer->session();
project = qobject_cast<QbsProject *>(session->projectForFile(file));
product = qobject_cast<QbsProductNode *>(session->nodeForFile(file)->projectNode());
project = qobject_cast<QbsProject *>(SessionManager::projectForFile(file));
product = qobject_cast<QbsProductNode *>(SessionManager::nodeForFile(file)->projectNode());
}
if (!project || !product)