diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 8e8bc3d831e39b3c27de01b6f345a951f035f018..19e8e94cdf9166568d0d3eb85b3b8a2e60977932 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -518,10 +518,6 @@ static int startOfOperator(TextEditor::ITextEditable *editor, completionKind = T_SLASH; --start; break; - case '#': - completionKind = T_POUND; - --start; - break; } if (start == pos) @@ -677,13 +673,6 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor) return m_startPosition; } - // Pre-processor completion - if (m_completionOperator == T_POUND) { - completePreprocessor(); - m_startPosition = startOfName; - return m_startPosition; - } - // Include completion if (m_completionOperator == T_STRING_LITERAL || m_completionOperator == T_ANGLE_STRING_LITERAL @@ -1263,31 +1252,6 @@ bool CppCodeCompletion::completeInclude(const QTextCursor &cursor) return !m_completions.isEmpty(); } -void CppCodeCompletion::completePreprocessor() -{ - TextEditor::CompletionItem item(this); - - item.text = QLatin1String("define"); m_completions.append(item); - item.text = QLatin1String("error"); m_completions.append(item); - item.text = QLatin1String("include"); m_completions.append(item); - item.text = QLatin1String("line"); m_completions.append(item); - item.text = QLatin1String("pragma"); m_completions.append(item); - item.text = QLatin1String("undef"); m_completions.append(item); - - item.text = QLatin1String("if"); m_completions.append(item); - item.text = QLatin1String("ifdef"); m_completions.append(item); - item.text = QLatin1String("ifndef"); m_completions.append(item); - item.text = QLatin1String("elif"); m_completions.append(item); - item.text = QLatin1String("else"); m_completions.append(item); - item.text = QLatin1String("endif"); m_completions.append(item); - - if (objcKeywordsWanted()) { - TextEditor::CompletionItem item(this); - item.text = QLatin1String("import"); - m_completions.append(item); - } -} - void CppCodeCompletion::completeNamespace(const QList<Symbol *> &candidates, const LookupContext &context) { diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h index 7c92bfe43d566e547627d383ec4f35769f33458f..b4bff01fba807157fc88f5d31b47a20ed8879234 100644 --- a/src/plugins/cpptools/cppcodecompletion.h +++ b/src/plugins/cpptools/cppcodecompletion.h @@ -89,7 +89,6 @@ private: void addCompletionItem(CPlusPlus::Symbol *symbol); bool completeInclude(const QTextCursor &cursor); - void completePreprocessor(); int globalCompletion(CPlusPlus::Symbol *lastVisibleSymbol, CPlusPlus::Document::Ptr thisDocument,