6 files changed, 6 insertions, 17 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp
index d6afc72e2b..1af3bdb936 100644
--- a/src/libs/cplusplus/SimpleLexer.cpp
+++ b/src/libs/cplusplus/SimpleLexer.cpp
@@ -158,7 +158,7 @@ QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state)
             lex.setScanAngleStringLiteralTokens(true);
 
         if (_objCEnabled && tk.is(T_IDENTIFIER))
-            simpleTk.f._objcTypeQualifier = (classifyObjectiveCTypeQualifiers(firstChar + tk.offset, tk.f.length) != Token_identifier);
+            simpleTk.f._objcTypeQualifier = (classifyObjectiveCContextKeyword(firstChar + tk.offset, tk.f.length) != Token_identifier);
 
         tokens.append(simpleTk);
     }
diff --git a/src/shared/cplusplus/CheckSpecifier.cpp b/src/shared/cplusplus/CheckSpecifier.cpp
index 5b32762c69..86ac6923a5 100644
--- a/src/shared/cplusplus/CheckSpecifier.cpp
+++ b/src/shared/cplusplus/CheckSpecifier.cpp
@@ -416,12 +416,3 @@ bool CheckSpecifier::visit(AttributeSpecifierAST * /*ast*/)
 {
     return false;
 }
-
-bool CheckSpecifier::visit(ObjCTypeNameAST * /*ast*/)
-{
-    // TODO: implement this (EV)
-//    _fullySpecifiedType = FullySpecifiedType();
-    return true;
-}
-
-
diff --git a/src/shared/cplusplus/CheckSpecifier.h b/src/shared/cplusplus/CheckSpecifier.h
index 4a46d90174..85057454a2 100644
--- a/src/shared/cplusplus/CheckSpecifier.h
+++ b/src/shared/cplusplus/CheckSpecifier.h
@@ -80,8 +80,6 @@ protected:
     virtual bool visit(TypeofSpecifierAST *ast);
     virtual bool visit(AttributeSpecifierAST *ast);
 
-    virtual bool visit(ObjCTypeNameAST *ast);
-
 private:
     SpecifierListAST *_specifier;
     FullySpecifiedType _fullySpecifiedType;
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
index 988076f3a7..9febb84c5e 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
@@ -234,7 +234,7 @@ static inline int classify9(const char *s) {
     return Token_identifier;
 }
 
-int CPlusPlus::classifyObjectiveCTypeQualifiers(const char *s, int n) {
+int CPlusPlus::classifyObjectiveCContextKeyword(const char *s, int n) {
   switch (n) {
     case 2: return classify2(s);
     case 3: return classify3(s);
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
index d0db427461..adeee50188 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
@@ -52,7 +52,7 @@ enum {
   Token_identifier
 };
 
-CPLUSPLUS_EXPORT int classifyObjectiveCTypeQualifiers(const char *s, int n);
+CPLUSPLUS_EXPORT int classifyObjectiveCContextKeyword(const char *s, int n);
 
 } // end of namespace CPlusPlus
 
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index 573ad6140e..a86f4c2395 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -5153,7 +5153,7 @@ bool Parser::parseObjCPropertyAttribute(ObjCPropertyAttributeAST *&node)
     node = new (_pool) ObjCPropertyAttributeAST;
 
     const Identifier *id = tok().identifier;
-    const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
+    const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
     switch (k) {
     case Token_copy:
     case Token_assign:
@@ -5251,7 +5251,7 @@ bool Parser::parseObjCTypeQualifiers(unsigned &type_qualifier)
         return false;
 
     const Identifier *id = tok().identifier;
-    const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
+    const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
     if (k == Token_identifier)
         return false;
     type_qualifier = consumeToken();
@@ -5264,7 +5264,7 @@ bool Parser::peekAtObjCContextKeyword(int kind)
         return false;
 
     const Identifier *id = tok().identifier;
-    const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
+    const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
     return k == kind;
 }