From 08ccda586254de7ff4c66ccdb98d9843847080be Mon Sep 17 00:00:00 2001 From: dt Date: Tue, 14 Sep 2010 15:15:57 +0200 Subject: EditorManager: Change openEditor/activateEditor to not do mode switching Also introduce a indirection, modes have now types, edit and debug have the same type, and editors do have a prefered type of modes instead of a prefered mode. That fixes the bug that if the prefered qml editing mode was set to design, then in switching between qml editors would - in Edit Mode: stay in edit mode - in Debug Mode: switch to debug mode --- src/plugins/cpptools/cppfindreferences.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cppfindreferences.cpp') diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index b0cd403ef3a..6029f33c4a7 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -304,9 +304,11 @@ void CppFindReferences::searchFinished() void CppFindReferences::openEditor(const Find::SearchResultItem &item) { if (item.path.size() > 0) { - TextEditor::BaseTextEditor::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos); + TextEditor::BaseTextEditor::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos, + QString(), + Core::EditorManager::ModeSwitch); } else { - Core::EditorManager::instance()->openEditor(item.text); + Core::EditorManager::instance()->openEditor(item.text, QString(), Core::EditorManager::ModeSwitch); } } -- cgit v1.2.3