From 1f3908e0a583043f782edc312bf21d74a38e2056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 5 Mar 2009 16:40:42 +0100
Subject: [PATCH] Avoid adding navigation history twice
This code is already in TextEditor::BaseTextEditor::openEditorAt.
---
src/plugins/cppeditor/cppeditor.cpp | 3 ---
src/plugins/texteditor/basetexteditor.cpp | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index f0334a89f6d..7711ae77778 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -369,10 +369,7 @@ void CPPEditor::jumpToMethod(int)
if (! symbol)
return;
- Core::EditorManager::instance()->addCurrentPositionToNavigationHistory(true);
openEditorAt(symbol);
- Core::EditorManager::instance()->addCurrentPositionToNavigationHistory();
- setFocus();
}
void CPPEditor::updateMethodBoxIndex()
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index c17262d18a8..0caa502d757 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -123,9 +123,9 @@ protected:
} // namespace TextEditor
ITextEditor *BaseTextEditor::openEditorAt(const QString &fileName,
- int line,
- int column,
- const QString &editorKind)
+ int line,
+ int column,
+ const QString &editorKind)
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->addCurrentPositionToNavigationHistory(true);
--
GitLab