From a6e04c363f5d9fe5d84528c8e921989d8d6121e0 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 6 Jun 2014 11:52:09 -0400 Subject: CppTools: CppHighlightingSupport takes a BaseTextDocument ...instead an ITextEditor. The ITextEditor was only used to access the file path and QTextDocument via the BaseTextEditorWidget. Change-Id: Idef2b8162b992fe3718e16e2a046e2ff214846f2 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 810597f8dc..a869324622 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -121,7 +121,7 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor , m_initialized(false) , m_lastHighlightRevision(0) , m_lastHighlightOnCompleteSemanticInfo(true) - , m_highlightingSupport(modelManager->highlightingSupport(textEditor)) + , m_highlightingSupport(modelManager->highlightingSupport(textEditor->baseTextDocument())) , m_completionAssistProvider( modelManager->completionAssistProvider(textEditor->document()->mimeType())) { @@ -595,7 +595,8 @@ void CppEditorSupport::onMimeTypeChanged() m_highlighter.cancel(); m_highlighter.waitForFinished(); - m_highlightingSupport.reset(m_modelManager->highlightingSupport(m_textEditor)); + m_highlightingSupport.reset( + m_modelManager->highlightingSupport(m_textEditor->baseTextDocument())); disconnect(this, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), this, SLOT(startHighlighting())); -- cgit v1.2.1