feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove perspective settings compatibility with 4.10

Browse Source 
That was 4 years ago

Change-Id: I6b2193051d5bd71f402f75484c1defef907f6693
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2023-11-29 15:45:50 +01:00
parent 867570d8dd
commit f97cb710ad
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -50,8 +50,7 @@ namespace Utils {
const char LAST_PERSPECTIVE_KEY[] = "LastPerspective"; const char LAST_PERSPECTIVE_KEY[] = "LastPerspective";
const char MAINWINDOW_KEY[] = "Debugger.MainWindow"; const char MAINWINDOW_KEY[] = "Debugger.MainWindow";
const char SHOW_CENTRALWIDGET_KEY[] = "ShowCentralWidget"; const char SHOW_CENTRALWIDGET_KEY[] = "ShowCentralWidget";
const char STATE_KEY[] = "State"; // Up to 4.10 const char STATE_KEY2[] = "State2";
const char STATE_KEY2[] = "State2"; // From 4.11 on
const char CHANGED_DOCK_KEY[] = "ChangedDocks"; const char CHANGED_DOCK_KEY[] = "ChangedDocks";
static DebuggerMainWindow *theMainWindow = nullptr; static DebuggerMainWindow *theMainWindow = nullptr;
@@ -435,16 +434,11 @@ void DebuggerMainWindow::restorePersistentSettings()
QtcSettings *settings = ICore::settings(); QtcSettings *settings = ICore::settings();
settings->beginGroup(MAINWINDOW_KEY); settings->beginGroup(MAINWINDOW_KEY);
// state2 is current, state is kept for upgradeing from <=4.10
const QHash<QString, QVariant> states2 = settings->value(STATE_KEY2).toHash(); const QHash<QString, QVariant> states2 = settings->value(STATE_KEY2).toHash();
const QHash<QString, QVariant> states = settings->value(STATE_KEY).toHash();
d->m_lastTypePerspectiveStates.clear(); d->m_lastTypePerspectiveStates.clear();
QSet<QString> keys = Utils::toSet(states2.keys()); QSet<QString> keys = Utils::toSet(states2.keys());
keys.unite(Utils::toSet(states.keys()));
for (const QString &type : keys) { for (const QString &type : keys) {
PerspectiveState state = states2.value(type).value<PerspectiveState>(); PerspectiveState state = states2.value(type).value<PerspectiveState>();
if (state.mainWindowState.isEmpty())
state.mainWindowState = states.value(type).toByteArray();
QTC_ASSERT(!state.mainWindowState.isEmpty(), continue); QTC_ASSERT(!state.mainWindowState.isEmpty(), continue);
d->m_lastTypePerspectiveStates.insert(type, state); d->m_lastTypePerspectiveStates.insert(type, state);
} }