From 7516ef49694187a1344b5f24fe6d22eea02220a2 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 30 Aug 2013 12:55:06 +0200 Subject: TextEditor: get CompletionAssistProvider from editor. And not from the global object pool. This way, the editors that have different highlighters for various language dialects, or editors that support multiple languages in a single editor, can decide themselves on what CompletionAssistProvider to provide. Change-Id: Ieebc4a8e7b3de6470fdb8103035aa3b8b2ba6598 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 6bb8bfbc04..cc1a0e74c8 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -27,6 +27,7 @@ ** ****************************************************************************/ +#include "cppcompletionassistprovider.h" #include "cpptoolseditorsupport.h" #include "cppmodelmanager.h" #include "cpplocalsymbols.h" @@ -229,6 +230,11 @@ void CppEditorSupport::recalculateSemanticInfoDetached(bool force) startHighlighting(); } +CppCompletionAssistProvider *CppEditorSupport::completionAssistProvider() const +{ + return m_completionAssistProvider.data(); +} + void CppEditorSupport::updateDocument() { m_revision = editorRevision(); -- cgit v1.2.1