Revert "Split Objective-C keyword parsing to handle the '@' separately."

This reverts commit 2a59d2ae0c889fe6e4ac50a3f110b0103f880c15.

1 files changed, 9 insertions, 26 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 85a7666970..3d7cbebf9d 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1197,35 +1197,18 @@ bool CppCodeCompletion::completeScope(const QList<LookupItem> &results,
     return ! m_completions.isEmpty();
 }
 
-void CppCodeCompletion::addKeyword(const QString &text)
-{
-    TextEditor::CompletionItem item(this);
-    item.text = text;
-    item.icon = m_icons.keywordIcon();
-    m_completions.append(item);
-}
-
 void CppCodeCompletion::addKeywords()
 {
-    // keyword completion items.
-    for (int i = T_FIRST_KEYWORD; i < T_FIRST_OBJC_KEYWORD; ++i) {
-        addKeyword(QLatin1String(Token::name(i)));
-    }
+    int keywordLimit = T_FIRST_OBJC_AT_KEYWORD;
+    if (objcKeywordsWanted())
+        keywordLimit = T_LAST_OBJC_AT_KEYWORD + 1;
 
-    if (objcKeywordsWanted()) {
-        // unique Objective-C keywords:
-        for (int i = T_FIRST_OBJC_KEYWORD; i <= T_LAST_OBJC_KEYWORD; ++i) {
-            addKeyword(QLatin1Char('@') + QLatin1String(Token::name(i)));
-        }
-
-        // overlapping keywords:
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_CATCH)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_CLASS)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_PRIVATE)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_PROTECTED)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_PUBLIC)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_THROW)));
-        addKeyword(QLatin1Char('@') + QLatin1String(Token::name(T_TRY)));
+    // keyword completion items.
+    for (int i = T_FIRST_KEYWORD; i < keywordLimit; ++i) {
+        TextEditor::CompletionItem item(this);
+        item.text = QLatin1String(Token::name(i));
+        item.icon = m_icons.keywordIcon();
+        m_completions.append(item);
     }
 }