Commit 0c8c6521 authored by hjk's avatar hjk
Browse files

debugger: make the mode an automatically released object

parent 4d6b7c4e
...@@ -1299,7 +1299,6 @@ public slots: ...@@ -1299,7 +1299,6 @@ public slots:
public: public:
DebuggerState m_state; DebuggerState m_state;
DebuggerMainWindow *m_mainWindow; DebuggerMainWindow *m_mainWindow;
DebugMode *m_debugMode;
DebuggerRunControlFactory *m_debuggerRunControlFactory; DebuggerRunControlFactory *m_debuggerRunControlFactory;
QString m_previousMode; QString m_previousMode;
...@@ -1397,7 +1396,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) ...@@ -1397,7 +1396,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
m_finishedContext = Context(0); m_finishedContext = Context(0);
m_anyContext = Context(0); m_anyContext = Context(0);
m_debugMode = 0;
m_mainWindow = 0; m_mainWindow = 0;
m_state = DebuggerNotReady; m_state = DebuggerNotReady;
m_snapshotHandler = 0; m_snapshotHandler = 0;
...@@ -1429,10 +1427,6 @@ DebuggerPluginPrivate::~DebuggerPluginPrivate() ...@@ -1429,10 +1427,6 @@ DebuggerPluginPrivate::~DebuggerPluginPrivate()
delete m_snapshotHandler; delete m_snapshotHandler;
m_snapshotHandler = 0; m_snapshotHandler = 0;
m_plugin->removeObject(theDebuggerCore->m_debugMode);
delete m_debugMode;
m_debugMode = 0;
} }
DebuggerCore *debuggerCore() DebuggerCore *debuggerCore()
...@@ -2323,7 +2317,7 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode) ...@@ -2323,7 +2317,7 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
m_mainWindow->onModeChanged(mode); m_mainWindow->onModeChanged(mode);
if (mode != m_debugMode) if (mode->id() != Constants::MODE_DEBUG)
return; return;
EditorManager *editorManager = EditorManager::instance(); EditorManager *editorManager = EditorManager::instance();
...@@ -3126,9 +3120,7 @@ void DebuggerPluginPrivate::extensionsInitialized() ...@@ -3126,9 +3120,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
// Debug mode setup // Debug mode setup
m_debugMode = new DebugMode; m_plugin->addAutoReleasedObject(new DebugMode);
m_plugin->addObject(m_debugMode);
// //
// Connections // Connections
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment