diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-08-30 12:55:06 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-09-09 10:15:55 +0200 |
| commit | 7516ef49694187a1344b5f24fe6d22eea02220a2 (patch) | |
| tree | e7d046f48d1ca44ebee9626f35bd7d885e43ae44 /src/plugins/cpptools/cpptoolseditorsupport.h | |
| parent | 33fd157b341215804f36105c91706ae07b5b26e1 (diff) | |
| download | qt-creator-7516ef49694187a1344b5f24fe6d22eea02220a2.tar.gz | |
TextEditor: get CompletionAssistProvider from editor.
And not from the global object pool. This way, the editors that have
different highlighters for various language dialects, or editors that
support multiple languages in a single editor, can decide themselves on
what CompletionAssistProvider to provide.
Change-Id: Ieebc4a8e7b3de6470fdb8103035aa3b8b2ba6598
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index b8f066174a..8a9f50b1c6 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -50,6 +50,8 @@ class ITextMark; namespace CppTools { +class CppCompletionAssistProvider; + /** * \brief The CppEditorSupport class oversees the actions that happen when a C++ text editor updates * its document. @@ -115,6 +117,8 @@ public: /// \param force do not check if the old semantic info is still valid void recalculateSemanticInfoDetached(bool force = false); + CppCompletionAssistProvider *completionAssistProvider() const; + signals: void documentUpdated(); void diagnosticsChanged(); @@ -189,6 +193,9 @@ private: unsigned m_lastHighlightRevision; QFuture<TextEditor::HighlightingResult> m_highlighter; QScopedPointer<CppTools::CppHighlightingSupport> m_highlightingSupport; + + // Completion: + QScopedPointer<CppCompletionAssistProvider> m_completionAssistProvider; }; } // namespace CppTools |