diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-01-16 10:48:09 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-01-21 12:19:12 +0100 |
| commit | df1bbb07d19a040ba4b61488bdcc3482fc40239e (patch) | |
| tree | cb32d1aae416a24e58618d3eddb874ed0f6b44c7 /src/plugins/cpptools/cppcompletionassist.cpp | |
| parent | 6d22df7d3f77db9935a1fb870054ddeed143f3e6 (diff) | |
| download | qt-creator-df1bbb07d19a040ba4b61488bdcc3482fc40239e.tar.gz | |
CppTools: Extract base class CppCompletionAssistProcessor
As as side effect, this also brings some more pragma completions for the
builtin-in completion engine, e.g. "pragma once" or "pragma omp atomic".
Change-Id: If3ef22076c331c653b78a87cfff836c1da38c8fb
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassist.cpp | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index 934c07a520..701cfba31a 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -602,24 +602,7 @@ bool isQPrivateSignal(const Symbol *symbol) // InternalCppCompletionAssistProcessor // ------------------------------------ InternalCppCompletionAssistProcessor::InternalCppCompletionAssistProcessor() - : m_startPosition(-1) - , m_snippetCollector(QLatin1String(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID), - QIcon(QLatin1String(":/texteditor/images/snippet.png"))) - , preprocessorCompletions(QStringList() - << QLatin1String("define") - << QLatin1String("error") - << QLatin1String("include") - << QLatin1String("line") - << QLatin1String("pragma") - << QLatin1String("undef") - << QLatin1String("if") - << QLatin1String("ifdef") - << QLatin1String("ifndef") - << QLatin1String("elif") - << QLatin1String("else") - << QLatin1String("endif")) - , m_model(new CppAssistProposalModel) - , m_hintProposal(0) + : m_model(new CppAssistProposalModel) { // FIXME: C++11? m_languageFeatures.objCEnabled = true; @@ -1176,7 +1159,7 @@ void InternalCppCompletionAssistProcessor::completeInclude(const QString &realPa void InternalCppCompletionAssistProcessor::completePreprocessor() { - foreach (const QString &preprocessorCompletion, preprocessorCompletions) + foreach (const QString &preprocessorCompletion, m_preprocessorCompletions) addCompletionItem(preprocessorCompletion); if (objcKeywordsWanted()) @@ -1706,11 +1689,6 @@ bool InternalCppCompletionAssistProcessor::completeQtMethod( return !m_completions.isEmpty(); } -void InternalCppCompletionAssistProcessor::addSnippets() -{ - m_completions.append(m_snippetCollector.collect()); -} - void InternalCppCompletionAssistProcessor::addKeywords() { int keywordLimit = T_FIRST_OBJC_AT_KEYWORD; |
