summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanager.cpp
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-03-04 09:38:01 +0100
committerhjk <qtc-committer@nokia.com>2009-03-04 09:38:01 +0100
commit12018c89d6ed55306c0fa08a2f9cd3cf28f415a3 (patch)
tree30e2543e91733af664070e9be76925efcd37412f /src/plugins/cpptools/cppmodelmanager.cpp
parent4deb36687aef263ca967980c56ded757d6bd4d27 (diff)
downloadqt-creator-12018c89d6ed55306c0fa08a2f9cd3cf28f415a3.tar.gz
Fixes: simplify ProjectExplorerPlugin::instance() access
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index f5425585fb..5847d509e1 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -48,7 +48,6 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <TranslationUnit.h>
@@ -545,12 +544,12 @@ CppModelManager::CppModelManager(QObject *parent)
m_core = Core::ICore::instance(); // FIXME
m_dirty = true;
- m_projectExplorer = ExtensionSystem::PluginManager::instance()
- ->getObject<ProjectExplorer::ProjectExplorerPlugin>();
+ ProjectExplorer::ProjectExplorerPlugin *pe =
+ ProjectExplorer::ProjectExplorerPlugin::instance();
- QTC_ASSERT(m_projectExplorer, return);
+ QTC_ASSERT(pe, return);
- ProjectExplorer::SessionManager *session = m_projectExplorer->session();
+ ProjectExplorer::SessionManager *session = pe->session();
QTC_ASSERT(session, return);
m_updateEditorSelectionsTimer = new QTimer(this);
@@ -586,7 +585,9 @@ CppModelManager::~CppModelManager()
{ }
Snapshot CppModelManager::snapshot() const
-{ return m_snapshot; }
+{
+ return m_snapshot;
+}
void CppModelManager::ensureUpdated()
{