diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index a4e2f0af68d..50d2afd86d4 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -305,7 +305,7 @@ void DebuggerMainWindow::loadPerspectiveHelper(const QByteArray &perspectiveId, { // Clean up old perspective. if (!m_currentPerspectiveId.isEmpty()) { - saveCurrentPerspective(); + savePerspectiveHelper(m_currentPerspectiveId); foreach (QDockWidget *dockWidget, m_dockForDockId) { QTC_ASSERT(dockWidget, continue); dockWidget->setFloating(false); @@ -402,16 +402,16 @@ void DebuggerMainWindow::loadPerspectiveHelper(const QByteArray &perspectiveId, m_statusLabel->clear(); } -void DebuggerMainWindow::saveCurrentPerspective() +void DebuggerMainWindow::savePerspectiveHelper(const QByteArray &perspectiveId) { - if (m_currentPerspectiveId.isEmpty()) + if (perspectiveId.isEmpty()) return; QSettings *settings = ICore::settings(); - settings->beginGroup(QString::fromLatin1(m_currentPerspectiveId)); + settings->beginGroup(QString::fromLatin1(perspectiveId)); saveSettings(settings); settings->setValue(QLatin1String("ToolSettingsSaved"), true); settings->endGroup(); - settings->setValue(QLatin1String(LAST_PERSPECTIVE_KEY), m_currentPerspectiveId); + settings->setValue(QLatin1String(LAST_PERSPECTIVE_KEY), perspectiveId); } QDockWidget *DebuggerMainWindow::registerDockWidget(const QByteArray &dockId, QWidget *widget) diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h index 4cc018d5b4d..16883b874ec 100644 --- a/src/plugins/debugger/debuggermainwindow.h +++ b/src/plugins/debugger/debuggermainwindow.h @@ -124,7 +124,6 @@ public: void registerPerspective(const QByteArray &perspectiveId, const Perspective *perspective); void registerToolbar(const QByteArray &perspectiveId, QWidget *widget); - void saveCurrentPerspective(); void resetCurrentPerspective(); void restorePerspective(const QByteArray &perspectiveId); @@ -141,10 +140,11 @@ public: void setPerspectiveEnabled(const QByteArray &perspectiveId, bool enabled); private: - void closeEvent(QCloseEvent *) final { saveCurrentPerspective(); } + void closeEvent(QCloseEvent *) final { savePerspectiveHelper(m_currentPerspectiveId); } QDockWidget *registerDockWidget(const QByteArray &dockId, QWidget *widget); void loadPerspectiveHelper(const QByteArray &perspectiveId, bool fromStoredSettings = true); + void savePerspectiveHelper(const QByteArray &perspectiveId); QByteArray m_currentPerspectiveId; QComboBox *m_perspectiveChooser;