diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 3f9cfc6caaa9a7e0d2f592b40686da1bf375f4dc..cb9f633d6abcacff781b9d37cde07dcba9d193e0 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -339,7 +339,6 @@ void GdbOptionPage::apply() DebuggerPlugin::DebuggerPlugin() { - m_pm = 0; m_generalOptionPage = 0; m_locationMark = 0; m_manager = 0; @@ -390,8 +389,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes m_manager = new DebuggerManager; - m_pm = ExtensionSystem::PluginManager::instance(); - ICore *core = ICore::instance(); QTC_ASSERT(core, return false); @@ -708,7 +705,7 @@ void DebuggerPlugin::extensionsInitialized() ProjectExplorer::ProjectExplorerPlugin *DebuggerPlugin::projectExplorer() const { - return m_pm->getObject<ProjectExplorer::ProjectExplorerPlugin>(); + return ProjectExplorer::ProjectExplorerPlugin::instance(); } /*! Activates the previous mode when the current mode is the debug mode. */ diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h index 4ab9c5b89f8fd5a5eeec673a539468386686d76e..06bdcbb656c403d00a423aa398bb1264c237ad24 100644 --- a/src/plugins/debugger/debuggerplugin.h +++ b/src/plugins/debugger/debuggerplugin.h @@ -104,7 +104,6 @@ private: DebuggerManager *m_manager; DebugMode *m_debugMode; - ExtensionSystem::PluginManager *m_pm; GdbOptionPage *m_generalOptionPage; QString m_previousMode;