1 files changed, 3 insertions, 15 deletions
diff --git a/src/libs/3rdparty/cplusplus/Matcher.cpp b/src/libs/3rdparty/cplusplus/Matcher.cpp
index 8ef26017c6..1ed201a8a4 100644
--- a/src/libs/3rdparty/cplusplus/Matcher.cpp
+++ b/src/libs/3rdparty/cplusplus/Matcher.cpp
@@ -154,19 +154,7 @@ bool Matcher::match(const NamedType *type, const NamedType *otherType)
 {
     if (type == otherType)
         return true;
-
-    const Name *name = type->name();
-    if (const QualifiedNameId *q = name->asQualifiedNameId())
-        name = q->name();
-
-    const Name *otherName = otherType->name();
-    if (const QualifiedNameId *q = otherName->asQualifiedNameId())
-        otherName = q->name();
-
-    if (! Matcher::match(name, otherName, this))
-        return false;
-
-    return true;
+    return Matcher::match(type->name(), otherType->name(), this);
 }
 
 bool Matcher::match(const Function *type, const Function *otherType)
@@ -324,8 +312,8 @@ bool Matcher::match(const TemplateNameId *name, const TemplateNameId *otherName)
     if (name->templateArgumentCount() != otherName->templateArgumentCount())
         return false;
     for (unsigned i = 0, ei = name->templateArgumentCount(); i != ei; ++i) {
-        const FullySpecifiedType &l = name->templateArgumentAt(i);
-        const FullySpecifiedType &r = otherName->templateArgumentAt(i);
+        const TemplateArgument &l = name->templateArgumentAt(i);
+        const TemplateArgument &r = otherName->templateArgumentAt(i);
         if (! l.match(r, this))
             return false;
     }