From 19637bd37f6b18f733639a8cf26d2a2cef61cec5 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 28 Jan 2009 14:18:59 +0100
Subject: [PATCH] Fixes: debugger: remove cached projecte explorer
singleton pointer
---
src/plugins/debugger/debuggerplugin.cpp | 5 +----
src/plugins/debugger/debuggerplugin.h | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 3f9cfc6caaa..cb9f633d6ab 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 4ab9c5b89f8..06bdcbb656c 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;
--
GitLab