Skip to content
Snippets Groups Projects
Commit 3d87d182 authored by mae's avatar mae
Browse files

cleanup

parent 2b24033f
No related branches found
No related tags found
No related merge requests found
...@@ -890,7 +890,7 @@ Core::IEditor *EditorManager::activateEditor(Core::IEditor *editor, OpenEditorFl ...@@ -890,7 +890,7 @@ Core::IEditor *EditorManager::activateEditor(Core::IEditor *editor, OpenEditorFl
Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, Core::IEditor *editor, OpenEditorFlags flags) Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, Core::IEditor *editor, OpenEditorFlags flags)
{ {
if (!view) if (!view)
view = currentSplitterOrView()->view(); view = currentEditorView();
Q_ASSERT(view); Q_ASSERT(view);
...@@ -1412,7 +1412,7 @@ void EditorManager::gotoNextDocHistory() ...@@ -1412,7 +1412,7 @@ void EditorManager::gotoNextDocHistory()
if (dialog->isVisible()) { if (dialog->isVisible()) {
dialog->selectNextEditor(); dialog->selectNextEditor();
} else { } else {
EditorView *view = currentSplitterOrView()->view(); EditorView *view = currentEditorView();
dialog->setEditors(m_d->m_view, view, m_d->m_editorModel); dialog->setEditors(m_d->m_view, view, m_d->m_editorModel);
dialog->selectNextEditor(); dialog->selectNextEditor();
showWindowPopup(); showWindowPopup();
...@@ -1425,7 +1425,7 @@ void EditorManager::gotoPreviousDocHistory() ...@@ -1425,7 +1425,7 @@ void EditorManager::gotoPreviousDocHistory()
if (dialog->isVisible()) { if (dialog->isVisible()) {
dialog->selectPreviousEditor(); dialog->selectPreviousEditor();
} else { } else {
EditorView *view = currentSplitterOrView()->view(); EditorView *view = currentEditorView();
dialog->setEditors(m_d->m_view, view, m_d->m_editorModel); dialog->setEditors(m_d->m_view, view, m_d->m_editorModel);
dialog->selectPreviousEditor(); dialog->selectPreviousEditor();
showWindowPopup(); showWindowPopup();
...@@ -1507,13 +1507,13 @@ OpenEditorsModel *EditorManager::openedEditorsModel() const ...@@ -1507,13 +1507,13 @@ OpenEditorsModel *EditorManager::openedEditorsModel() const
void EditorManager::addCurrentPositionToNavigationHistory(IEditor *editor, const QByteArray &saveState) void EditorManager::addCurrentPositionToNavigationHistory(IEditor *editor, const QByteArray &saveState)
{ {
currentSplitterOrView()->view()->addCurrentPositionToNavigationHistory(editor, saveState); currentEditorView()->addCurrentPositionToNavigationHistory(editor, saveState);
updateActions(); updateActions();
} }
void EditorManager::goBackInNavigationHistory() void EditorManager::goBackInNavigationHistory()
{ {
currentSplitterOrView()->view()->goBackInNavigationHistory(); currentEditorView()->goBackInNavigationHistory();
updateActions(); updateActions();
ensureEditorManagerVisible(); ensureEditorManagerVisible();
return; return;
...@@ -1521,7 +1521,7 @@ void EditorManager::goBackInNavigationHistory() ...@@ -1521,7 +1521,7 @@ void EditorManager::goBackInNavigationHistory()
void EditorManager::goForwardInNavigationHistory() void EditorManager::goForwardInNavigationHistory()
{ {
currentSplitterOrView()->view()->goForwardInNavigationHistory(); currentEditorView()->goForwardInNavigationHistory();
updateActions(); updateActions();
ensureEditorManagerVisible(); ensureEditorManagerVisible();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment