From fb206c3fe27ff7c884ff6c2827eabefbbbf1f695 Mon Sep 17 00:00:00 2001
From: mae <qtc-committer@nokia.com>
Date: Thu, 5 Feb 2009 12:15:51 +0100
Subject: [PATCH] make inplace activation the default editor activation, unless
 the view has been specified. This allows to use the open editors view as
 tabbar replacement also in split mode.

---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 10 +++++-----
 src/plugins/coreplugin/editormanager/editormanager.h   |  4 +---
 .../coreplugin/editormanager/openeditorswindow.cpp     |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 359bdb1c0f1..97380484c3e 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -750,12 +750,12 @@ void EditorManager::activateEditor(IEditor *editor, OpenEditorFlags flags)
     if (splitterOrView && splitterOrView->splitter())
         splitterOrView = 0; // safety if currentView gets out of sync
     setCurrentView(0);
+    if (!editor)
+        return;
 
-    if (editor && (flags & ActivateInPlace)) {
-        SplitterOrView *place = m_d->m_splitter->findView(editor);
-        if (place && !place->isSplitter()) {
-            splitterOrView = place;
-        }
+    SplitterOrView *place = m_d->m_splitter->findView(editor);
+    if (place && !place->isSplitter()) {
+        splitterOrView = place;
     }
 
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 761bde24696..2d02512b2df 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -104,9 +104,7 @@ public:
 
     enum OpenEditorFlag {
         NoActivate = 1,
-        IgnoreNavigationHistory = 2,
-        ActivateInPlace = 4
-
+        IgnoreNavigationHistory = 2
     };
     Q_DECLARE_FLAGS(OpenEditorFlags, OpenEditorFlag)
 
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 42d0e551b78..c1c7f18bb25 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -235,7 +235,7 @@ void OpenEditorsWindow::selectEditor(QTreeWidgetItem *item)
     if (item)
         editor = item->data(0, Qt::UserRole).value<IEditor*>();
     if (editor)
-        EditorManager::instance()->activateEditor(editor, EditorManager::ActivateInPlace);
+        EditorManager::instance()->activateEditor(editor);
 }
 
 void OpenEditorsWindow::editorClicked(QTreeWidgetItem *item)
-- 
GitLab