Cpp locator filters were not opening edit mode (if you were elsewhere),

and the "current document" filter didn't jump to the column

Reviewed-by: Erik Verbruggen

diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index 838e0c1..c8bcf7f 100644 (file)
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -109,7 +109,8 @@ QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInterfac
 void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
 {
     ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
-    TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);
+    TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
+                                             QString(), Core::EditorManager::ModeSwitch);
 }
 
 void CppCurrentDocumentFilter::refresh(QFutureInterface<void> &future)

diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 4dcc855..1041ca6 100644 (file)
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -127,7 +127,8 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(QFutureInterface<Locato
 void CppLocatorFilter::accept(Locator::FilterEntry selection) const
 {
     ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
-    TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column);
+    TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
+                                             QString(), Core::EditorManager::ModeSwitch);
 }
 
 void CppLocatorFilter::reset()