diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-06-06 10:55:09 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-06-12 17:02:36 +0200 |
| commit | fc7f5ba364fb7a09a1038faf0f8c35b20c955810 (patch) | |
| tree | fcee1fdba274b566c23c64a0af229dfcf7ce5c8a /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | cf3d47ccd8c8fbf7990cc9c3ac501a0777410403 (diff) | |
| download | qt-creator-fc7f5ba364fb7a09a1038faf0f8c35b20c955810.tar.gz | |
CppTools: CMM::completionAssistProvider takes a mimeType
No need to pass more than needed.
Change-Id: I047cc44f17342999e0809d022df35ba9a4a8dfb8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 3866f774f5..810597f8dc 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -122,7 +122,8 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor , m_lastHighlightRevision(0) , m_lastHighlightOnCompleteSemanticInfo(true) , m_highlightingSupport(modelManager->highlightingSupport(textEditor)) - , m_completionAssistProvider(m_modelManager->completionAssistProvider(textEditor)) + , m_completionAssistProvider( + modelManager->completionAssistProvider(textEditor->document()->mimeType())) { connect(m_modelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)), this, SLOT(onDocumentUpdated(CPlusPlus::Document::Ptr))); @@ -602,7 +603,8 @@ void CppEditorSupport::onMimeTypeChanged() connect(this, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), this, SLOT(startHighlighting())); - m_completionAssistProvider = m_modelManager->completionAssistProvider(m_textEditor); + m_completionAssistProvider + = m_modelManager->completionAssistProvider(m_textEditor->document()->mimeType()); updateDocumentNow(); } |