diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-06-06 11:52:09 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-06-12 17:02:52 +0200 |
| commit | a6e04c363f5d9fe5d84528c8e921989d8d6121e0 (patch) | |
| tree | 19b8ea509e37735b2b483772246a96bf1b195108 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | fc7f5ba364fb7a09a1038faf0f8c35b20c955810 (diff) | |
| download | qt-creator-a6e04c363f5d9fe5d84528c8e921989d8d6121e0.tar.gz | |
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 <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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())); |