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

EditLocation: Use QByteArray directly

Browse Source 
The `state` in the edit location is used to save the editor state, which
is a QByteArray, so there is no use in saving it in a variant instead of
a QByteArray directly.

Change-Id: I987a7d1bbb66b2cb1c1f4c7cfe0451742ea5bca2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2023-07-19 11:29:51 +02:00
parent 9b0d90ec33
commit 934eb86d77
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -3487,7 +3487,7 @@ void EditorManager::setLastEditLocation(const IEditor* editor)
location.document = document; location.document = document;
location.filePath = document->filePath(); location.filePath = document->filePath();
location.id = document->id(); location.id = document->id();
location.state = QVariant(state); location.state = state;
d->m_globalLastEditLocation = location; d->m_globalLastEditLocation = location;
} }

12
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -241,7 +241,7 @@ void EditorView::updateEditorHistory(IEditor *editor, QList<EditLocation> &histo
location.document = document; location.document = document;
location.filePath = document->filePath(); location.filePath = document->filePath();
location.id = document->id(); location.id = document->id();
location.state = QVariant(state); location.state = state;
for (int i = 0; i < history.size(); ++i) { for (int i = 0; i < history.size(); ++i) {
const EditLocation &item = history.at(i); const EditLocation &item = history.at(i);
@@ -472,7 +472,7 @@ void EditorView::addCurrentPositionToNavigationHistory(const QByteArray &saveSta
location.document = document; location.document = document;
location.filePath = document->filePath(); location.filePath = document->filePath();
location.id = document->id(); location.id = document->id();
location.state = QVariant(state); location.state = state;
m_currentNavigationHistoryPosition = qMin(m_currentNavigationHistoryPosition, m_navigationHistory.size()); // paranoia m_currentNavigationHistoryPosition = qMin(m_currentNavigationHistoryPosition, m_navigationHistory.size()); // paranoia
m_navigationHistory.insert(m_currentNavigationHistoryPosition, location); m_navigationHistory.insert(m_currentNavigationHistoryPosition, location);
++m_currentNavigationHistoryPosition; ++m_currentNavigationHistoryPosition;
@@ -527,7 +527,7 @@ void EditorView::updateCurrentPositionInNavigationHistory()
location->document = document; location->document = document;
location->filePath = document->filePath(); location->filePath = document->filePath();
location->id = document->id(); location->id = document->id();
location->state = QVariant(editor->saveState()); location->state = editor->saveState();
} }
static bool fileNameWasRemoved(const FilePath &filePath) static bool fileNameWasRemoved(const FilePath &filePath)
@@ -558,7 +558,7 @@ void EditorView::goBackInNavigationHistory()
continue; continue;
} }
} }
editor->restoreState(location.state.toByteArray()); editor->restoreState(location.state);
break; break;
} }
updateNavigatorActions(); updateNavigatorActions();
@@ -589,7 +589,7 @@ void EditorView::goForwardInNavigationHistory()
continue; continue;
} }
} }
editor->restoreState(location.state.toByteArray()); editor->restoreState(location.state);
break; break;
} }
if (m_currentNavigationHistoryPosition >= m_navigationHistory.size()) if (m_currentNavigationHistoryPosition >= m_navigationHistory.size())
@@ -615,7 +615,7 @@ void EditorView::goToEditLocation(const EditLocation &location)
} }
if (editor) { if (editor) {
editor->restoreState(location.state.toByteArray()); editor->restoreState(location.state);
} }
} }

2
src/plugins/coreplugin/editormanager/editorview.h
View File

@@ -43,7 +43,7 @@ struct EditLocation {
QPointer<IDocument> document; QPointer<IDocument> document;
Utils::FilePath filePath; Utils::FilePath filePath;
Utils::Id id; Utils::Id id;
QVariant state; QByteArray state;
}; };
class SplitterOrView; class SplitterOrView;