From d43f1662d0b44b3b930989f11604661c377bd67e Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 11 Feb 2020 14:00:09 +0100 Subject: Make TextEditor setup more flexible So far it was only possible to combine TextEditorFactory, BaseTextEditor and TextEditorWidget directly. That TextEditorWidget is also directly a QPlainTextEdit made it impossible to "decorate" the text editor widget with something else without a lot of effort. Make it possible to create a text editor factory that returns an arbitrary widget, as long as it can be "cast" to a TextEditorWidget with either qobject_cast or Aggregation::query. That way the TextEditorWidget instance can be attached to the editor widget via Aggregation. Adapt other code that accesses TextEditorWidget from editors accordingly. Introduce a common method how to do that. Change-Id: I72b8721f3a8a8d8281c39af75253e9c80cbe1250 Reviewed-by: Orgad Shaneh Reviewed-by: David Schulz --- src/plugins/clangcodemodel/test/clangautomationutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/clangcodemodel') diff --git a/src/plugins/clangcodemodel/test/clangautomationutils.cpp b/src/plugins/clangcodemodel/test/clangautomationutils.cpp index e4a421ffe9..bd2e99b8b1 100644 --- a/src/plugins/clangcodemodel/test/clangautomationutils.cpp +++ b/src/plugins/clangcodemodel/test/clangautomationutils.cpp @@ -106,7 +106,7 @@ TextEditor::ProposalModelPtr completionResults(TextEditor::BaseTextEditor *textE { using namespace TextEditor; - auto textEditorWidget = qobject_cast(textEditor->widget()); + auto textEditorWidget = TextEditorWidget::fromEditor(textEditor); QTC_ASSERT(textEditorWidget, return TextEditor::ProposalModelPtr()); AssistInterface *assistInterface = textEditorWidget->createAssistInterface( TextEditor::Completion, TextEditor::ExplicitlyInvoked); -- cgit v1.2.3