diff options
| author | hjk <hjk121@nokiamail.com> | 2014-10-01 22:39:47 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-10-06 22:32:48 +0200 |
| commit | 1f65111e55b3e487289ff7a0dfbd4313c383d77f (patch) | |
| tree | c68d02e06a8c95ee85ec267b409eccc0d6797dbe /src/plugins/android/javaeditor.cpp | |
| parent | 5bb8134ec135eae72d738220d2acd037d00cafbf (diff) | |
TextEditor: Move CompletionAssistProvider construction
... to the editor factories and pass it to the document, not the widget.
Saves some code, puts fewer objects into the object pool.
Change-Id: Iaaf250af74dc4e0c62700873accbb40ba88b7d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/android/javaeditor.cpp')
| -rw-r--r-- | src/plugins/android/javaeditor.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index 34d5c38b6f8..6d3af92a43e 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -49,20 +49,6 @@ namespace Android { namespace Internal { // -// JavaEditorWidget -// - -class JavaEditorWidget : public TextEditor::TextEditorWidget -{ -public: - JavaEditorWidget() - { - setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>()); - } -}; - - -// // JavaDocument // @@ -106,12 +92,11 @@ JavaEditorFactory::JavaEditorFactory() addMimeType(Constants::JAVA_MIMETYPE); setDocumentCreator([]() { return new JavaDocument; }); - setEditorWidgetCreator([]() { return new JavaEditorWidget; }); setAutoCompleterCreator([]() { return new JavaAutoCompleter; }); setGenericSyntaxHighlighter(QLatin1String(Constants::JAVA_MIMETYPE)); setCommentStyle(Utils::CommentDefinition::CppStyle); - setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection); + setCompletionAssistProvider(new JavaCompletionAssistProvider); } } // namespace Internal |