feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move openEditorAt from BaseTextEditorWidget to EditorManager

Browse Source 
More sensible place, gotoLine is a method in IEditor anyhow.

Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-05-30 17:26:51 +02:00
parent 97ce8e4098
commit 2125525e77
25 changed files with 84 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -154,25 +154,6 @@ private:
using namespace Internal;
Core::IEditor *BaseTextEditorWidget::openEditorAt(const QString &fileName, int line, int column,
Core::Id editorKind,
Core::EditorManager::OpenEditorFlags flags,
bool *newEditor)
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->cutForwardNavigationHistory();
editorManager->addCurrentPositionToNavigationHistory();
Core::IEditor *editor = Core::EditorManager::openEditor(fileName, editorKind,
flags, newEditor);
TextEditor::ITextEditor *texteditor = qobject_cast<TextEditor::ITextEditor *>(editor);
if (texteditor && line != -1) {
texteditor->gotoLine(line, column);
return texteditor;
}
return editor;
}
QString BaseTextEditorWidget::plainTextFromSelection(const QTextCursor &cursor) const
{
// Copy the selected text as plain text
@@ -4918,9 +4899,8 @@ bool BaseTextEditorWidget::openLink(const Link &link, bool inNextSplit)
return true;
}
return openEditorAt(link.targetFileName, link.targetLine, link.targetColumn, Core::Id(),
Core::EditorManager::IgnoreNavigationHistory
| Core::EditorManager::ModeSwitch);
return Core::EditorManager::openEditorAt(link.targetFileName, link.targetLine, link.targetColumn,
Core::Id(), Core::EditorManager::ModeSwitch);
}
void BaseTextEditorWidget::updateLink(QMouseEvent *e)