diff options
author | hjk <hjk121@nokiamail.com> | 2014-08-19 12:12:45 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-08-20 13:28:44 +0200 |
commit | cb35594800a2f6d567ba78b8ed329f5eff8dfacd (patch) | |
tree | 31b2fe952017eff98a97931190054eff033162c5 /src/plugins/android/javaeditor.cpp | |
parent | b25c575b22f060f50f4d2382de6473dec83ad2ce (diff) |
TextEditor: Centralize settings connections setup
All editors did that manually, with varying approaches. Connect once
when the document is made known to the EditorWidget instead.
Change-Id: Ib0828b08158539859f6f89c8080435a027aa06ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/android/javaeditor.cpp')
-rw-r--r-- | src/plugins/android/javaeditor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index 532127749d9..1520c9dd343 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -33,7 +33,6 @@ #include "androidconstants.h" #include "javacompletionassistprovider.h" -#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorconstants.h> #include <texteditor/normalindenter.h> #include <texteditor/highlighterutils.h> @@ -56,14 +55,12 @@ JavaEditor::JavaEditor() setDuplicateSupported(true); setCommentStyle(Utils::CommentDefinition::CppStyle); setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>()); - setAutoCompleter(new JavaAutoCompleter); } Core::IEditor *JavaEditor::duplicate() { JavaEditorWidget *ret = new JavaEditorWidget; ret->setTextDocument(editorWidget()->textDocumentPtr()); - TextEditor::TextEditorSettings::initializeEditor(ret); return ret->editor(); } @@ -73,6 +70,7 @@ Core::IEditor *JavaEditor::duplicate() JavaEditorWidget::JavaEditorWidget() { + setAutoCompleter(new JavaAutoCompleter); } TextEditor::BaseTextEditor *JavaEditorWidget::createEditor() |