C++: Get rid of {Name,Type}::isEqualTo()

...since it's superseded by the class Matcher.

For consistency, rename FullySpecifiedType::isEqualTo() to match().

Change-Id: I07640f9218d814e0350265de45f05929e5d595a9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 22 insertions, 38 deletions

diff --git a/src/libs/3rdparty/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h
index 5ff953f87e..79c0f01024 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.h
+++ b/src/libs/3rdparty/cplusplus/Symbols.h
@@ -232,16 +232,16 @@ public:
     ForwardClassDeclaration(Clone *clone, Subst *subst, ForwardClassDeclaration *original);
     virtual ~ForwardClassDeclaration();
 
+    // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ForwardClassDeclaration *asForwardClassDeclaration() const
     { return this; }
 
     virtual ForwardClassDeclaration *asForwardClassDeclaration()
     { return this; }
 
+    // Type's interface
     virtual const ForwardClassDeclaration *asForwardClassDeclarationType() const
     { return this; }
 
@@ -261,27 +261,25 @@ public:
     Enum(Clone *clone, Subst *subst, Enum *original);
     virtual ~Enum();
 
+    bool isScoped() const;
+    void setScoped(bool scoped);
+
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const Enum *asEnum() const
     { return this; }
 
     virtual Enum *asEnum()
     { return this; }
 
+    // Type's interface
     virtual const Enum *asEnumType() const
     { return this; }
 
     virtual Enum *asEnumType()
     { return this; }
 
-    bool isScoped() const;
-    void setScoped(bool scoped);
-
 protected:
     virtual void visitSymbol0(SymbolVisitor *visitor);
     virtual void accept0(TypeVisitor *visitor);
@@ -349,29 +347,27 @@ public:
 
     bool isSignatureEqualTo(const Function *other, Matcher *matcher = 0) const;
 
+    bool isAmbiguous() const; // internal
+    void setAmbiguous(bool isAmbiguous); // internal
+
+    bool maybeValidPrototype(unsigned actualArgumentCount) const;
+
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const Function *asFunction() const
     { return this; }
 
     virtual Function *asFunction()
     { return this; }
 
+    // Type's interface
     virtual const Function *asFunctionType() const
     { return this; }
 
     virtual Function *asFunctionType()
     { return this; }
 
-    bool isAmbiguous() const; // internal
-    void setAmbiguous(bool isAmbiguous); // internal
-
-    bool maybeValidPrototype(unsigned actualArgumentCount) const;
-
 protected:
     virtual void visitSymbol0(SymbolVisitor *visitor);
     virtual void accept0(TypeVisitor *visitor);
@@ -410,15 +406,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const Template *asTemplate() const
     { return this; }
 
     virtual Template *asTemplate()
     { return this; }
 
+    // Type's interface
     virtual const Template *asTemplateType() const
     { return this; }
 
@@ -442,15 +436,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const Namespace *asNamespace() const
     { return this; }
 
     virtual Namespace *asNamespace()
     { return this; }
 
+    // Type's interface
     virtual const Namespace *asNamespaceType() const
     { return this; }
 
@@ -526,15 +518,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const Class *asClass() const
     { return this; }
 
     virtual Class *asClass()
     { return this; }
 
+    // Type's interface
     virtual const Class *asClassType() const
     { return this; }
 
@@ -667,16 +657,16 @@ public:
     ObjCForwardProtocolDeclaration(Clone *clone, Subst *subst, ObjCForwardProtocolDeclaration *original);
     virtual ~ObjCForwardProtocolDeclaration();
 
+    // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ObjCForwardProtocolDeclaration *asObjCForwardProtocolDeclaration() const
     { return this; }
 
     virtual ObjCForwardProtocolDeclaration *asObjCForwardProtocolDeclaration()
     { return this; }
 
+    // Type's interface
     virtual const ObjCForwardProtocolDeclaration *asObjCForwardProtocolDeclarationType() const
     { return this; }
 
@@ -703,15 +693,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ObjCProtocol *asObjCProtocol() const
     { return this; }
 
     virtual ObjCProtocol *asObjCProtocol()
     { return this; }
 
+    // Type's interface
     virtual const ObjCProtocol *asObjCProtocolType() const
     { return this; }
 
@@ -734,16 +722,16 @@ public:
     ObjCForwardClassDeclaration(Clone *clone, Subst *subst, ObjCForwardClassDeclaration *original);
     virtual ~ObjCForwardClassDeclaration();
 
+    // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ObjCForwardClassDeclaration *asObjCForwardClassDeclaration() const
     { return this; }
 
     virtual ObjCForwardClassDeclaration *asObjCForwardClassDeclaration()
     { return this; }
 
+    // Type's interface
     virtual const ObjCForwardClassDeclaration *asObjCForwardClassDeclarationType() const
     { return this; }
 
@@ -780,15 +768,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ObjCClass *asObjCClass() const
     { return this; }
 
     virtual ObjCClass *asObjCClass()
     { return this; }
 
+    // Type's interface
     virtual const ObjCClass *asObjCClassType() const
     { return this; }
 
@@ -832,15 +818,13 @@ public:
     // Symbol's interface
     virtual FullySpecifiedType type() const;
 
-    // Type's interface
-    virtual bool isEqualTo(const Type *other) const;
-
     virtual const ObjCMethod *asObjCMethod() const
     { return this; }
 
     virtual ObjCMethod *asObjCMethod()
     { return this; }
 
+    // Type's interface
     virtual const ObjCMethod *asObjCMethodType() const
     { return this; }