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

24
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -573,10 +573,7 @@ public:
static TextEditor::ITextEditor *currentTextEditor()
{
if (const Core::EditorManager *editorManager = Core::EditorManager::instance())
if (Core::IEditor *editor = editorManager->currentEditor())
return qobject_cast<TextEditor::ITextEditor*>(editor);
return 0;
return qobject_cast<TextEditor::ITextEditor *>(Core::EditorManager::currentEditor());
}
static bool currentTextEditorPosition(ContextData *data)
@@ -1033,10 +1030,7 @@ public slots:
void handleAddToWatchWindow()
{
// Requires a selection, but that's the only case we want anyway.
EditorManager *editorManager = EditorManager::instance();
if (!editorManager)
return;
IEditor *editor = editorManager->currentEditor();
IEditor *editor = EditorManager::currentEditor();
if (!editor)
return;
ITextEditor *textEditor = qobject_cast<ITextEditor*>(editor);
@@ -2192,7 +2186,7 @@ void DebuggerPluginPrivate::cleanupViews()
// if they are not modified and not current editor.
if (editor->property(Constants::OPENED_WITH_DISASSEMBLY).toBool()
|| (!editor->document()->isModified()
&& editor != editorManager->currentEditor())) {
&& editor != EditorManager::currentEditor())) {
toClose.append(editor);
} else {
editor->setProperty(Constants::OPENED_BY_DEBUGGER, false);
@@ -2470,9 +2464,9 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
return;
}
EditorManager *editorManager = EditorManager::instance();
if (editorManager->currentEditor())
editorManager->currentEditor()->widget()->setFocus();
if (IEditor *editor = EditorManager::currentEditor())
editor->widget()->setFocus();
m_toolTipManager->debugModeEntered();
}
@@ -2611,12 +2605,10 @@ void DebuggerPluginPrivate::openTextEditor(const QString &titlePattern0,
if (m_shuttingDown)
return;
QString titlePattern = titlePattern0;
EditorManager *editorManager = EditorManager::instance();
QTC_ASSERT(editorManager, return);
IEditor *editor = editorManager->openEditorWithContents(
IEditor *editor = EditorManager::openEditorWithContents(
CC::K_DEFAULT_TEXT_EDITOR_ID, &titlePattern, contents);
QTC_ASSERT(editor, return);
editorManager->activateEditor(editor, EditorManager::IgnoreNavigationHistory);
EditorManager::activateEditor(editor, EditorManager::IgnoreNavigationHistory);
}