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

editormanager: simplify use of interface

Browse Source 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2012-05-08 09:43:14 +02:00
committed by hjk
parent 2ef2532bf6
commit 21bf0046c3
83 changed files with 215 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -919,7 +919,7 @@ void MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesFlags f
emFlags = EditorManager::ModeSwitch;
if (flags & ICore::CanContainLineNumbers)
emFlags |= EditorManager::CanContainLineNumber;
Core::IEditor *editor = editorManager()->openEditor(absoluteFilePath, Id(), emFlags);
Core::IEditor *editor = EditorManager::openEditor(absoluteFilePath, Id(), emFlags);
if (!editor && (flags & ICore::StopOnLoadFail))
return;
}
@@ -931,7 +931,7 @@ void MainWindow::setFocusToEditor()
bool focusWasMovedToEditor = false;
// give focus to the editor if we have one
if (IEditor *editor = m_editorManager->currentEditor()) {
if (IEditor *editor = EditorManager::currentEditor()) {
if (qApp->focusWidget() != editor->widget()->focusWidget()) {
QWidget *w = editor->widget()->focusWidget();
if (!w)
@@ -1055,9 +1055,9 @@ void MainWindow::openFileWith()
if (!editorId.isValid())
continue;
if (isExternal) {
editorManager()->openExternalEditor(fileName, editorId);
EditorManager::openExternalEditor(fileName, editorId);
} else {
editorManager()->openEditor(fileName, editorId, Core::EditorManager::ModeSwitch);
EditorManager::openEditor(fileName, editorId, Core::EditorManager::ModeSwitch);
}
}
}
@@ -1352,7 +1352,7 @@ void MainWindow::openRecentFile()
{
if (const QAction *action = qobject_cast<const QAction*>(sender())) {
const DocumentManager::RecentFile file = action->data().value<DocumentManager::RecentFile>();
editorManager()->openEditor(file.first, file.second, Core::EditorManager::ModeSwitch);
EditorManager::openEditor(file.first, file.second, EditorManager::ModeSwitch);
}
}