feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: CMM::completionAssistProvider takes a mimeType

Browse Source 
No need to pass more than needed.

Change-Id: I047cc44f17342999e0809d022df35ba9a4a8dfb8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-06-06 10:55:09 -04:00
parent cf3d47ccd8
commit fc7f5ba364
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -885,10 +885,13 @@ ModelManagerSupport *CppModelManager::modelManagerSupportForMimeType(const QStri
return m_idTocodeModelSupporter.value(id, m_modelManagerSupportFallback.data());
}
CppCompletionAssistProvider *CppModelManager::completionAssistProvider(Core::IEditor *editor) const
CppCompletionAssistProvider *CppModelManager::completionAssistProvider(const QString &mimeType) const
{
ModelManagerSupport *cms = modelManagerSupportForMimeType(editor->document()->mimeType());
if (mimeType.isEmpty())
return 0;
ModelManagerSupport *cms = modelManagerSupportForMimeType(mimeType);
QTC_ASSERT(cms, return 0);
return cms->completionAssistProvider();
}

2
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -114,7 +114,7 @@ public:
virtual void addModelManagerSupport(ModelManagerSupport *modelManagerSupport);
virtual ModelManagerSupport *modelManagerSupportForMimeType(const QString &mimeType) const;
virtual CppCompletionAssistProvider *completionAssistProvider(Core::IEditor *editor) const;
virtual CppCompletionAssistProvider *completionAssistProvider(const QString &mimeType) const;
virtual CppHighlightingSupport *highlightingSupport(Core::IEditor *editor) const;
virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);

2
src/plugins/cpptools/cppmodelmanagerinterface.h
View File

@@ -259,7 +259,7 @@ public:
virtual void addModelManagerSupport(ModelManagerSupport *modelManagerSupport) = 0;
virtual ModelManagerSupport *modelManagerSupportForMimeType(const QString &mimeType) const = 0;
virtual CppCompletionAssistProvider *completionAssistProvider(Core::IEditor *editor) const = 0;
virtual CppCompletionAssistProvider *completionAssistProvider(const QString &mimeType) const = 0;
virtual CppHighlightingSupport *highlightingSupport(Core::IEditor *editor) const = 0;
virtual void setIndexingSupport(CppTools::CppIndexingSupport *indexingSupport) = 0;

6
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -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();
}