summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolseditorsupport.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-08-30 12:55:06 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2013-09-09 10:15:55 +0200
commit7516ef49694187a1344b5f24fe6d22eea02220a2 (patch)
treee7d046f48d1ca44ebee9626f35bd7d885e43ae44 /src/plugins/cpptools/cpptoolseditorsupport.cpp
parent33fd157b341215804f36105c91706ae07b5b26e1 (diff)
downloadqt-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.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolseditorsupport.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 6bb8bfbc04..cc1a0e74c8 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -27,6 +27,7 @@
**
****************************************************************************/
+#include "cppcompletionassistprovider.h"
#include "cpptoolseditorsupport.h"
#include "cppmodelmanager.h"
#include "cpplocalsymbols.h"
@@ -229,6 +230,11 @@ void CppEditorSupport::recalculateSemanticInfoDetached(bool force)
startHighlighting();
}
+CppCompletionAssistProvider *CppEditorSupport::completionAssistProvider() const
+{
+ return m_completionAssistProvider.data();
+}
+
void CppEditorSupport::updateDocument()
{
m_revision = editorRevision();