From 40eab8980b978557c72ee534530db347185d275a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 19 Mar 2009 15:17:05 +0100
Subject: [PATCH] Last 'finish' of this iteration of navigation history.
Task: 240811
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 5 +----
src/plugins/coreplugin/editormanager/editormanager.h | 2 +-
src/plugins/texteditor/basetexteditor.cpp | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index f003a62019c..8badefeb9a8 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1358,7 +1358,7 @@ QList<IEditor*> EditorManager::editorHistory() const
return m_d->m_editorHistory;
}
-void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &saveState)
+void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &saveState, bool compress)
{
IEditor *editor = currentEditor();
if (!editor)
@@ -1367,14 +1367,11 @@ void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &save
return;
QString fileName = editor->file()->fileName();
- bool compress;
QByteArray state;
if (saveState.isNull()) {
state = editor->saveState();
- compress = false;
} else {
state = saveState;
- compress = true;
}
// cut existing
int firstIndexToRemove;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 46eb010f47c..75c7e28cc34 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -132,7 +132,7 @@ public:
QList<IEditor*> editorsForFiles(QList<IFile*> files) const;
//QList<EditorGroup *> editorGroups() const;
QList<IEditor*> editorHistory() const;
- void addCurrentPositionToNavigationHistory(const QByteArray &saveState = QByteArray());
+ void addCurrentPositionToNavigationHistory(const QByteArray &saveState = QByteArray(), bool compress = false);
bool saveEditor(IEditor *editor);
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 3ad5b89f24f..6574d416310 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -961,6 +961,7 @@ void BaseTextEditor::setTextCursor(const QTextCursor &cursor)
void BaseTextEditor::gotoLine(int line, int column)
{
+ d->m_lastCursorChangeWasInteresting = false; // avoid adding the previous position to history
const int blockNumber = line - 1;
const QTextBlock &block = document()->findBlockByNumber(blockNumber);
if (block.isValid()) {
--
GitLab