debugger: move SnapshotHandler to DebuggerPluginPrivate

src/plugins/debugger/debuggerplugin.cpp

@@ -1016,6 +1016,7 @@ public:
     DebuggerPlugin *m_plugin;
 
     QList<QPointer<DebuggerRunControl> > m_allRunControls;
+    SnapshotHandler *m_snapshotHandler;
 };
 
 DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
@@ -1055,6 +1056,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
     m_debugMode = 0;
     m_uiSwitcher = 0;
     m_state = DebuggerNotReady;
+    m_snapshotHandler = 0;
 }
 
 bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *errorMessage)
@@ -1108,7 +1110,10 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
 
     // Session related data
     m_sessionEngine = new SessionEngine;
-    m_snapshotWindow->setModel(m_sessionEngine->m_snapshotHandler->model());
+
+    // Snapshot
+    m_snapshotHandler = new SnapshotHandler(m_sessionEngine);
+    m_snapshotWindow->setModel(m_snapshotHandler->model());
 
     // Debug mode setup
     m_debugMode = new DebugMode(this);
@@ -2701,13 +2706,13 @@ void DebuggerPlugin::createNewDock(QWidget *widget)
 void DebuggerPlugin::runControlStarted(DebuggerRunControl *runControl)
 {
     d->connectEngine(runControl->engine());
-    d->m_sessionEngine->m_snapshotHandler->appendSnapshot(runControl);
+    d->m_snapshotHandler->appendSnapshot(runControl);
 }
 
 void DebuggerPlugin::runControlFinished(DebuggerRunControl *runControl)
 {
     Q_UNUSED(runControl);
-    d->m_sessionEngine->m_snapshotHandler->removeSnapshot(runControl);
+    d->m_snapshotHandler->removeSnapshot(runControl);
     d->disconnectEngine();
 }
 

src/plugins/debugger/sessionengine.cpp

@@ -28,7 +28,6 @@
 **************************************************************************/
 
 #include "sessionengine.h"
-#include "snapshothandler.h"
 #include "breakhandler.h"
 #include "watchhandler.h"
 
@@ -39,8 +38,7 @@ namespace Internal {
 // started during a session.
 
 SessionEngine::SessionEngine()
-    : DebuggerEngine(DebuggerStartParameters()),
-      m_snapshotHandler(new SnapshotHandler(this))
+    : DebuggerEngine(DebuggerStartParameters())
 {
 }
 

src/plugins/debugger/sessionengine.h

@@ -35,8 +35,6 @@
 namespace Debugger {
 namespace Internal {
 
-class SnapshotHandler;
-
 // This class contains data serving as a template for debugger engines
 // started during a session.
 
@@ -57,11 +55,6 @@ public:
 
     void loadSessionData();
     void saveSessionData();
-
-public:
-    // The global set of snapshots.
-    SnapshotHandler *m_snapshotHandler;
-    // The model serving as command dispatcher.
 };