diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-08-30 13:13:44 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-09-09 11:59:14 +0200 |
| commit | b4a1bd415f3783d826f012a7d47d1e96218e1730 (patch) | |
| tree | 89d88a8fc184e0273ae3f48a27ff5f653cad2443 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | 49adb78ec967be09cfb934d997fb9bc54f1c535e (diff) | |
| download | qt-creator-b4a1bd415f3783d826f012a7d47d1e96218e1730.tar.gz | |
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 <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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(); } |