diff options
Diffstat (limited to 'src/plugins/cppeditor/cppplugin.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppplugin.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 212350b07e..c45ac20d8a 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -118,10 +118,10 @@ Core::IFile *CppEditorFactory::open(const QString &fileName) Core::IEditor *CppEditorFactory::createEditor(QWidget *parent) { - CPPEditor *editor = new CPPEditor(parent); + CPPEditorWidget *editor = new CPPEditorWidget(parent); editor->setRevisionsVisible(true); m_owner->initializeEditor(editor); - return editor->editableInterface(); + return editor->editor(); } QStringList CppEditorFactory::mimeTypes() const @@ -172,7 +172,7 @@ CppPlugin *CppPlugin::instance() return m_instance; } -void CppPlugin::initializeEditor(CPPEditor *editor) +void CppPlugin::initializeEditor(CPPEditorWidget *editor) { m_actionHandler->setupActions(editor); @@ -352,7 +352,7 @@ ExtensionSystem::IPlugin::ShutdownFlag CppPlugin::aboutToShutdown() void CppPlugin::switchDeclarationDefinition() { Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); if (editor) editor->switchDeclarationDefinition(); } @@ -360,7 +360,7 @@ void CppPlugin::switchDeclarationDefinition() void CppPlugin::jumpToDefinition() { Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); if (editor) editor->jumpToDefinition(); } @@ -368,7 +368,7 @@ void CppPlugin::jumpToDefinition() void CppPlugin::renameSymbolUnderCursor() { Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); if (editor) editor->renameSymbolUnderCursor(); } @@ -376,32 +376,32 @@ void CppPlugin::renameSymbolUnderCursor() void CppPlugin::findUsages() { Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); if (editor) editor->findUsages(); } -void CppPlugin::quickFix(TextEditor::ITextEditable *editable) +void CppPlugin::quickFix(TextEditor::ITextEditor *editor) { - m_currentTextEditable = editable; + m_currentEditor = editor; quickFixNow(); } void CppPlugin::quickFixNow() { - if (! m_currentTextEditable) + if (! m_currentEditor) return; Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *currentEditor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *currentEditor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); - if (CPPEditor *editor = qobject_cast<CPPEditor*>(m_currentTextEditable->widget())) { + if (CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(m_currentEditor->widget())) { if (currentEditor == editor) { if (editor->isOutdated()) m_quickFixTimer->start(QUICKFIX_INTERVAL); else TextEditor::CompletionSupport::instance()-> - complete(m_currentTextEditable, TextEditor::QuickFixCompletion, true); + complete(m_currentEditor, TextEditor::QuickFixCompletion, true); } } } @@ -431,7 +431,7 @@ void CppPlugin::currentEditorChanged(Core::IEditor *editor) if (! editor) return; - else if (CPPEditor *textEditor = qobject_cast<CPPEditor *>(editor->widget())) { + else if (CPPEditorWidget *textEditor = qobject_cast<CPPEditorWidget *>(editor->widget())) { textEditor->rehighlight(/*force = */ true); } } @@ -439,7 +439,7 @@ void CppPlugin::currentEditorChanged(Core::IEditor *editor) void CppPlugin::openTypeHierarchy() { Core::EditorManager *em = Core::EditorManager::instance(); - CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget()); + CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget()); if (editor) { Core::NavigationWidget *navigation = Core::NavigationWidget::instance(); navigation->activateSubWidget(QLatin1String(Constants::TYPE_HIERARCHY_ID)); |