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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 397cb912808..6355c3e3f2d 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -285,7 +285,8 @@ void CppFileSettingsWidget::slotEdit()
     QString path = licenseTemplatePath();
     // Edit existing file with C++
     if (!path.isEmpty()) {
-        Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
+        Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID),
+                                                    Core::EditorManager::ModeSwitch);
         return;
     }
     // Pick a file name and write new template, edit with C++
@@ -301,7 +302,8 @@ void CppFileSettingsWidget::slotEdit()
     file.write(tr(licenseTemplateTemplate).toUtf8());
     file.close();
     setLicenseTemplatePath(path);
-    Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
+    Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID),
+                                                Core::EditorManager::ModeSwitch);
 }
 
 // --------------- CppFileSettingsPage