From b4a1bd415f3783d826f012a7d47d1e96218e1730 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 30 Aug 2013 13:13:44 +0200 Subject: C++: clean-up CppCompletionAssist. This is step 1 of 2 for merging the various provider factories into a single class. Merging has the advantage that selecting based on editor (content) mime-type only has to select one class, instead of re-doing the selection for each class separately. Change-Id: I11f815151bd4769ae6028b636793d6a80d02e202 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index cc1a0e74c8..4c77287ac2 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -232,7 +232,7 @@ void CppEditorSupport::recalculateSemanticInfoDetached(bool force) CppCompletionAssistProvider *CppEditorSupport::completionAssistProvider() const { - return m_completionAssistProvider.data(); + return m_completionAssistProvider; } void CppEditorSupport::updateDocument() @@ -526,6 +526,8 @@ void CppEditorSupport::onMimeTypeChanged() connect(this, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), this, SLOT(startHighlighting())); + m_completionAssistProvider = m_modelManager->completionAssistProvider(m_textEditor); + updateDocumentNow(); } -- cgit v1.2.1