debugger: disentangle settings read and write code

3 files changed, 19 insertions, 40 deletions

diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h
index c115f5f45f..3c26edfeed 100644
--- a/src/plugins/debugger/debuggercore.h
+++ b/src/plugins/debugger/debuggercore.h
@@ -100,9 +100,6 @@ public:
     virtual void resetLocation() = 0;
     virtual void removeLocationMark() = 0;
 
-    virtual void readSettings() = 0;
-    virtual void writeSettings() const = 0;
-
     virtual bool isReverseDebugging() const = 0;
     virtual void runControlStarted(DebuggerRunControl *runControl) = 0;
     virtual void runControlFinished(DebuggerRunControl *runControl) = 0;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 707cde0dfd..5b0b7e9cda 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -902,6 +902,9 @@ public:
     ~DebuggerPluginPrivate();
 
     bool initialize(const QStringList &arguments, QString *errorMessage);
+    void extensionsInitialized();
+    void aboutToShutdown();
+
     void connectEngine(DebuggerEngine *engine);
     void disconnectEngine() { connectEngine(0); }
     DebuggerEngine *currentEngine() const { return m_currentEngine; }
@@ -1025,9 +1028,6 @@ public slots:
     void showStatusMessage(const QString &msg, int timeout = -1);
     void openMemoryEditor();
 
-    void readSettings();
-    void writeSettings() const;
-
     const CPlusPlus::Snapshot &cppCodeModelSnapshot() const;
 
     void showQtDumperLibraryWarning(const QString &details);
@@ -1045,7 +1045,6 @@ public slots:
     void remoteCommand(const QStringList &options, const QStringList &);
 
     bool isReverseDebugging() const;
-    void extensionsInitialized();
 
     BreakHandler *breakHandler() const { return m_breakHandler; }
     SnapshotHandler *snapshotHandler() const { return m_snapshotHandler; }
@@ -2439,22 +2438,6 @@ void DebuggerPluginPrivate::coreShutdown()
     m_shuttingDown = true;
 }
 
-void DebuggerPluginPrivate::writeSettings() const
-{
-    m_debuggerSettings->writeSettings();
-    m_mainWindow->writeSettings();
-    if (GdbOptionsPage::gdbBinariesChanged)
-        GdbOptionsPage::writeGdbBinarySettings();
-}
-
-void DebuggerPluginPrivate::readSettings()
-{
-    //qDebug() << "PLUGIN READ SETTINGS";
-    m_debuggerSettings->readSettings();
-    m_mainWindow->readSettings();
-    GdbOptionsPage::readGdbBinarySettings();
-}
-
 const CPlusPlus::Snapshot &DebuggerPluginPrivate::cppCodeModelSnapshot() const
 {
     using namespace CppTools;
@@ -2868,7 +2851,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
     m_mainWindow->createDockWidget(CppLanguage, localsAndWatchers);
     m_mainWindow->createDockWidget(QmlLanguage, m_scriptConsoleWindow);
 
-    readSettings();
+    m_debuggerSettings->readSettings();
+    m_mainWindow->readSettings();
+    GdbOptionsPage::readGdbBinarySettings();
 
     // Register factory of DebuggerRunControl.
     m_debuggerRunControlFactory = new DebuggerRunControlFactory
@@ -3274,6 +3259,17 @@ void DebuggerPluginPrivate::showModuleSymbols(const QString &moduleName,
     createNewDock(w);
 }
 
+void DebuggerPluginPrivate::aboutToShutdown()
+{
+    disconnect(sessionManager(),
+        SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
+        this, 0);
+    m_debuggerSettings->writeSettings();
+    m_mainWindow->writeSettings();
+    if (GdbOptionsPage::gdbBinariesChanged)
+        GdbOptionsPage::writeGdbBinarySettings();
+}
+
 } // namespace Internal
 
 
@@ -3301,22 +3297,9 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
     return theDebuggerCore->initialize(arguments, errorMessage);
 }
 
-void DebuggerPlugin::readSettings()
-{
-    theDebuggerCore->readSettings();
-}
-
-void DebuggerPlugin::writeSettings() const
-{
-    theDebuggerCore->writeSettings();
-}
-
 ExtensionSystem::IPlugin::ShutdownFlag DebuggerPlugin::aboutToShutdown()
 {
-    disconnect(sessionManager(),
-        SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
-        theDebuggerCore, 0);
-    writeSettings();
+    theDebuggerCore->aboutToShutdown();
     return SynchronousShutdown;
 }
 
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 391353bd55..fa9fee8bde 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -73,8 +73,7 @@ private:
     void remoteCommand(const QStringList &options, const QStringList &arguments);
     ShutdownFlag aboutToShutdown();
     void extensionsInitialized();
-    void readSettings();
-    void writeSettings() const;
+
     void runControlStarted(DebuggerRunControl *runControl);
     void runControlFinished(DebuggerRunControl *runControl);
 };