From f97cb710addbd343d572971cd5b25fbf07bbe35c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 29 Nov 2023 15:45:50 +0100 Subject: [PATCH] Debugger: Remove perspective settings compatibility with 4.10 That was 4 years ago Change-Id: I6b2193051d5bd71f402f75484c1defef907f6693 Reviewed-by: hjk --- src/plugins/debugger/debuggermainwindow.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 03948aaf320..6d2d9acb676 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -50,8 +50,7 @@ namespace Utils { const char LAST_PERSPECTIVE_KEY[] = "LastPerspective"; const char MAINWINDOW_KEY[] = "Debugger.MainWindow"; const char SHOW_CENTRALWIDGET_KEY[] = "ShowCentralWidget"; -const char STATE_KEY[] = "State"; // Up to 4.10 -const char STATE_KEY2[] = "State2"; // From 4.11 on +const char STATE_KEY2[] = "State2"; const char CHANGED_DOCK_KEY[] = "ChangedDocks"; static DebuggerMainWindow *theMainWindow = nullptr; @@ -435,16 +434,11 @@ void DebuggerMainWindow::restorePersistentSettings() QtcSettings *settings = ICore::settings(); settings->beginGroup(MAINWINDOW_KEY); - // state2 is current, state is kept for upgradeing from <=4.10 const QHash states2 = settings->value(STATE_KEY2).toHash(); - const QHash states = settings->value(STATE_KEY).toHash(); d->m_lastTypePerspectiveStates.clear(); QSet keys = Utils::toSet(states2.keys()); - keys.unite(Utils::toSet(states.keys())); for (const QString &type : keys) { PerspectiveState state = states2.value(type).value(); - if (state.mainWindowState.isEmpty()) - state.mainWindowState = states.value(type).toByteArray(); QTC_ASSERT(!state.mainWindowState.isEmpty(), continue); d->m_lastTypePerspectiveStates.insert(type, state); }