diff options
| author | hjk <[email protected]> | 2009-03-04 09:38:01 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2009-03-04 09:38:01 +0100 |
| commit | 12018c89d6ed55306c0fa08a2f9cd3cf28f415a3 (patch) | |
| tree | 30e2543e91733af664070e9be76925efcd37412f /src/plugins/bookmarks/bookmarkmanager.cpp | |
| parent | 4deb36687aef263ca967980c56ded757d6bd4d27 (diff) | |
Fixes: simplify ProjectExplorerPlugin::instance() access
Diffstat (limited to 'src/plugins/bookmarks/bookmarkmanager.cpp')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index c3bbb2031af..4954cad38e5 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -36,7 +36,6 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> #include <coreplugin/uniqueidmanager.h> -#include <extensionsystem/pluginmanager.h> #include <projectexplorer/projectexplorer.h> #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> @@ -306,18 +305,15 @@ QWidget *BookmarkContext::widget() // BookmarkManager //// -BookmarkManager::BookmarkManager() : - m_bookmarkIcon(QIcon(QLatin1String(":/bookmarks/images/bookmark.png"))) +BookmarkManager::BookmarkManager() + : m_bookmarkIcon(QIcon(QLatin1String(":/bookmarks/images/bookmark.png"))) { m_selectionModel = new QItemSelectionModel(this, this); connect(Core::ICore::instance(), SIGNAL(contextChanged(Core::IContext*)), this, SLOT(updateActionStatus())); - ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); - ProjectExplorerPlugin *projectExplorer = pm->getObject<ProjectExplorerPlugin>(); - - connect(projectExplorer->session(), SIGNAL(sessionLoaded()), + connect(ProjectExplorerPlugin::instance()->session(), SIGNAL(sessionLoaded()), this, SLOT(loadBookmarks())); updateActionStatus(); @@ -559,9 +555,7 @@ TextEditor::ITextEditor *BookmarkManager::currentTextEditor() const /* Returns the current session. */ SessionManager *BookmarkManager::sessionManager() const { - ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); - ProjectExplorerPlugin *pe = pm->getObject<ProjectExplorerPlugin>(); - return pe->session(); + return ProjectExplorerPlugin::instance()->session(); } BookmarkManager::State BookmarkManager::state() const |