summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-05-08 15:48:17 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-06-10 10:15:40 +0000
commit23b8a3b2e83e46e9ca8b1e7e314fad7030b23ff4 (patch)
treebf30a066c35c2df4385ff3cd08a9b683e216269b /src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
parent264132da27ce9a11ca102ce7efaae13b9baaab6b (diff)
downloadqt-creator-23b8a3b2e83e46e9ca8b1e7e314fad7030b23ff4.tar.gz
Clang: Use completion through backend process
This makes us independent of libclang crashes for completion. Re-parsing for highlighting still happens in the Qt Creator process. Run in verbose mode: qtc.clangcodemodel.ipc=true Run tests: -test "ClangCodeModel" Task-number: QTCREATORBUG-14108 Task-number: QTCREATORBUG-12819 Change-Id: Id3e95bd2afdb6508bbd1d35fddc69534a909b905 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagersupportinternal.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanagersupportinternal.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp b/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
index 46f750e8b1..02100c0f1b 100644
--- a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
+++ b/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
@@ -37,24 +37,29 @@
using namespace CppTools;
using namespace CppTools::Internal;
-ModelManagerSupportInternal::ModelManagerSupportInternal()
- : m_completionAssistProvider(new InternalCompletionAssistProvider)
+QString ModelManagerSupportProviderInternal::id() const
{
+ return QLatin1String("CppTools.BuiltinCodeModel");
}
-ModelManagerSupportInternal::~ModelManagerSupportInternal()
+QString ModelManagerSupportProviderInternal::displayName() const
{
+ return QCoreApplication::translate("ModelManagerSupportInternal::displayName",
+ "Qt Creator Built-in");
}
-QString ModelManagerSupportInternal::id() const
+ModelManagerSupport::Ptr ModelManagerSupportProviderInternal::createModelManagerSupport()
{
- return QLatin1String("CppTools.BuiltinCodeModel");
+ return ModelManagerSupport::Ptr(new ModelManagerSupportInternal);
}
-QString ModelManagerSupportInternal::displayName() const
+ModelManagerSupportInternal::ModelManagerSupportInternal()
+ : m_completionAssistProvider(new InternalCompletionAssistProvider)
+{
+}
+
+ModelManagerSupportInternal::~ModelManagerSupportInternal()
{
- return QCoreApplication::translate("ModelManagerSupportInternal::displayName",
- "Qt Creator Built-in");
}
BaseEditorDocumentProcessor *ModelManagerSupportInternal::editorDocumentProcessor(