From 6a4310a44afc0396b462f9ac9f3524161155645a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 15 Apr 2013 17:31:53 +0200 Subject: [PATCH] EditorManager: Remove code duplication. Change-Id: I366852f788c1d28351e9f853b16d180886892c55 Reviewed-by: David Schulz --- .../editormanager/editormanager.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 3d77de1529a..6248155bfbe 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -2176,11 +2176,7 @@ Core::IEditor *EditorManager::duplicateEditor(Core::IEditor *editor) void EditorManager::split(Qt::Orientation orientation) { - SplitterOrView *view = d->m_currentView; - - if (!view) - view = d->m_currentEditor ? d->m_splitter->findView(d->m_currentEditor) - : d->m_splitter->findFirstView(); + SplitterOrView *view = currentSplitterOrView(); if (view && !view->splitter()) view->split(orientation); @@ -2200,9 +2196,7 @@ void EditorManager::splitSideBySide() void EditorManager::removeCurrentSplit() { - SplitterOrView *viewToClose = d->m_currentView; - if (!viewToClose && d->m_currentEditor) - viewToClose = d->m_splitter->findView(d->m_currentEditor); + SplitterOrView *viewToClose = currentSplitterOrView(); if (!viewToClose || viewToClose->isSplitter() || viewToClose == d->m_splitter) return; @@ -2231,14 +2225,7 @@ void EditorManager::gotoOtherSplit() if (!d->m_splitter->isSplitter()) splitSideBySide(); - SplitterOrView *currentView = d->m_currentView; - if (!currentView && d->m_currentEditor) - currentView = d->m_splitter->findView(d->m_currentEditor); - if (!currentView) - currentView = d->m_splitter->findFirstView(); - SplitterOrView *view = d->m_splitter->findNextView(currentView); - if (!view) - view = d->m_splitter->findFirstView(); + SplitterOrView *view = currentSplitterOrView(); if (view) { if (IEditor *editor = view->editor()) { setCurrentEditor(editor, true);