From e3bc7d19cf201ae3c1039695ba01dc494848404f Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 3 Sep 2014 10:57:51 +0200 Subject: TextEditor: Move CompletionAssistProvider to *Widget All the others live there, too. Change-Id: I0a418bf235343d40a53fbee089234765386ee05d Reviewed-by: Christian Stenger --- src/plugins/android/javaeditor.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/plugins/android/javaeditor.cpp') diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index d1035bc197..a9a9faa993 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -58,6 +58,19 @@ public: JavaEditor() { setDuplicateSupported(true); + } +}; + + +// +// JavaEditorWidget +// + +class JavaEditorWidget : public TextEditor::BaseTextEditorWidget +{ +public: + JavaEditorWidget() + { setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject()); } }; @@ -106,8 +119,9 @@ JavaEditorFactory::JavaEditorFactory() setDisplayName(tr("Java Editor")); addMimeType(Constants::JAVA_MIMETYPE); - setEditorCreator([]() { return new JavaEditor; }); setDocumentCreator([]() { return new JavaDocument; }); + setEditorWidgetCreator([]() { return new JavaEditorWidget; }); + setEditorCreator([]() { return new JavaEditor; }); setAutoCompleterCreator([]() { return new JavaAutoCompleter; }); setGenericSyntaxHighlighter(QLatin1String(Constants::JAVA_MIMETYPE)); setCommentStyle(Utils::CommentDefinition::CppStyle); -- cgit v1.2.1