summaryrefslogtreecommitdiff
path: root/src/plugins/android/javaeditor.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-07-30 17:02:39 +0200
committerhjk <hjk121@nokiamail.com>2014-07-31 12:40:52 +0200
commit9fd2fe5a9a0b4824ac22c8c46b2dd1ed55ce8bfa (patch)
treeaf98647c2a317fffd381ff4ced176fa26a9c41d8 /src/plugins/android/javaeditor.cpp
parent80fb77285666fa12378aefabc4cc0290639d942c (diff)
downloadqt-creator-9fd2fe5a9a0b4824ac22c8c46b2dd1ed55ce8bfa.tar.gz
TextEditor: Make completion assist provider a data member
In case of the CppEditor a direct member is not possible due to setup restrictions inside the CppEditor machinery. I'd expect that to be fixable when the editor base system is in good shape. Change-Id: I184e219ca2dff6f67c9b58c182212eb12972cc84 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/android/javaeditor.cpp')
-rw-r--r--src/plugins/android/javaeditor.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index daf55fd2ec..163941fcd9 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -56,6 +56,7 @@ JavaEditor::JavaEditor(JavaEditorWidget *editor)
TextEditor::Constants::C_TEXTEDITOR));
setDuplicateSupported(true);
setCommentStyle(Utils::CommentDefinition::CppStyle);
+ setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>());
}
Core::IEditor *JavaEditor::duplicate()
@@ -66,11 +67,6 @@ Core::IEditor *JavaEditor::duplicate()
return ret->editor();
}
-TextEditor::CompletionAssistProvider *JavaEditor::completionAssistProvider()
-{
- return ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>();
-}
-
//
// JavaEditorWidget
//