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

Use EditorManager::openEditorAt instead of duplicating code

Browse Source 
Change-Id: I231e89849e2f06958d05a511320ec236b5702a1c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-05-31 15:16:06 +02:00
parent 2125525e77
commit 4933406f06
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1992,20 +1992,14 @@ bool CPPEditorWidget::openCppEditorAt(const Link &link, bool inNextSplit)
if (!link.hasValidTarget()) if (!link.hasValidTarget())
return false; return false;
Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::EditorManager::OpenEditorFlags flags = Core::EditorManager::ModeSwitch;
if (inNextSplit) { if (inNextSplit)
editorManager->gotoOtherSplit(); flags |= Core::EditorManager::OpenInOtherSplit;
} else if (baseTextDocument()->fileName() == link.targetFileName) {
editorManager->addCurrentPositionToNavigationHistory();
gotoLine(link.targetLine, link.targetColumn);
setFocus();
return true;
}
return Core::EditorManager::openEditorAt(link.targetFileName, return Core::EditorManager::openEditorAt(link.targetFileName,
link.targetLine, link.targetLine,
link.targetColumn, link.targetColumn,
Constants::CPPEDITOR_ID); Constants::CPPEDITOR_ID,
flags);
} }
void CPPEditorWidget::semanticRehighlight(bool force) void CPPEditorWidget::semanticRehighlight(bool force)

13
src/plugins/debugger/qml/qmlinspectoradapter.cpp
View File

@@ -472,17 +472,8 @@ void QmlInspectorAdapter::jumpToObjectDefinitionInEditor(
{ {
const QString fileName = m_engine->toFileInProject(objSource.url()); const QString fileName = m_engine->toFileInProject(objSource.url());
Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::EditorManager::openEditorAt(fileName, objSource.lineNumber(),
Core::IEditor *editor = editorManager->openEditor(fileName); 0, Core::Id(), Core::EditorManager::ModeSwitch);
TextEditor::ITextEditor *textEditor
= qobject_cast<TextEditor::ITextEditor*>(editor);
if (textEditor) {
editorManager->addCurrentPositionToNavigationHistory();
textEditor->gotoLine(objSource.lineNumber());
textEditor->widget()->setFocus();
}
if (debugId != -1 && debugId != m_currentSelectedDebugId) { if (debugId != -1 && debugId != m_currentSelectedDebugId) {
m_currentSelectedDebugId = debugId; m_currentSelectedDebugId = debugId;
m_currentSelectedDebugName = agent()->displayName(debugId); m_currentSelectedDebugName = agent()->displayName(debugId);