From 988cc958ab78cf9debeaef3e93c0007519dc2289 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 26 Aug 2010 12:23:09 +0200
Subject: Renamed Symbol::identity() to Symbol::unqualifiedName().

---
 src/shared/cplusplus/Scope.cpp   |  4 ++--
 src/shared/cplusplus/Symbol.cpp  |  4 ++--
 src/shared/cplusplus/Symbol.h    |  2 +-
 src/shared/cplusplus/Symbols.cpp | 28 ++++++++++++++--------------
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/shared/cplusplus')

diff --git a/src/shared/cplusplus/Scope.cpp b/src/shared/cplusplus/Scope.cpp
index 8d70b7854a..e5bfee9e1c 100644
--- a/src/shared/cplusplus/Scope.cpp
+++ b/src/shared/cplusplus/Scope.cpp
@@ -180,7 +180,7 @@ Symbol *SymbolTable::lookat(const Identifier *id) const
     const unsigned h = id->hashCode() % _hashSize;
     Symbol *symbol = _hash[h];
     for (; symbol; symbol = symbol->_next) {
-        const Name *identity = symbol->identity();
+        const Name *identity = symbol->unqualifiedName();
         if (! identity) {
             continue;
         } else if (const NameId *nameId = identity->asNameId()) {
@@ -210,7 +210,7 @@ Symbol *SymbolTable::lookat(int operatorId) const
     const unsigned h = operatorId % _hashSize;
     Symbol *symbol = _hash[h];
     for (; symbol; symbol = symbol->_next) {
-        const Name *identity = symbol->identity();
+        const Name *identity = symbol->unqualifiedName();
         if (const OperatorNameId *op = identity->asOperatorNameId()) {
             if (op->kind() == operatorId)
                 break;
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp
index c2fe648244..40d51c65ca 100644
--- a/src/shared/cplusplus/Symbol.cpp
+++ b/src/shared/cplusplus/Symbol.cpp
@@ -199,7 +199,7 @@ const char *Symbol::fileName() const
 unsigned Symbol::fileNameLength() const
 { return fileId()->size(); }
 
-const Name *Symbol::identity() const
+const Name *Symbol::unqualifiedName() const
 {
     if (! _name)
         return 0;
@@ -221,7 +221,7 @@ void Symbol::setName(const Name *name)
         _hashCode = 0;
     else {
         HashCode hh;
-        _hashCode = hh(identity());
+        _hashCode = hh(unqualifiedName());
     }
 }
 
diff --git a/src/shared/cplusplus/Symbol.h b/src/shared/cplusplus/Symbol.h
index 61c4e69b2d..3781305fd9 100644
--- a/src/shared/cplusplus/Symbol.h
+++ b/src/shared/cplusplus/Symbol.h
@@ -276,7 +276,7 @@ public:
     /// Returns this Symbol's index.
     unsigned index() const;
 
-    const Name *identity() const;
+    const Name *unqualifiedName() const;
 
     bool isGenerated() const;
 
diff --git a/src/shared/cplusplus/Symbols.cpp b/src/shared/cplusplus/Symbols.cpp
index a76d69468b..7dae779217 100644
--- a/src/shared/cplusplus/Symbols.cpp
+++ b/src/shared/cplusplus/Symbols.cpp
@@ -204,8 +204,8 @@ bool Function::isEqualTo(const Type *other) const
         return false;
 #endif
 
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r))) {
         if (argumentCount() != o->argumentCount())
             return false;
@@ -394,8 +394,8 @@ bool Enum::isEqualTo(const Type *other) const
     const Enum *o = other->asEnumType();
     if (! o)
         return false;
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r)
         return true;
     else if (! l)
@@ -492,8 +492,8 @@ bool Namespace::isEqualTo(const Type *other) const
     const Namespace *o = other->asNamespaceType();
     if (! o)
         return false;
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r)))
         return true;
     return false;
@@ -634,8 +634,8 @@ bool Class::isEqualTo(const Type *other) const
     const Class *o = other->asClassType();
     if (! o)
         return false;
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r)))
         return true;
     else
@@ -730,8 +730,8 @@ bool ObjCClass::isEqualTo(const Type *other) const
     if (!o)
         return false;
 
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r)))
         return true;
     else
@@ -789,8 +789,8 @@ bool ObjCProtocol::isEqualTo(const Type *other) const
     if (!o)
         return false;
 
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r)))
         return true;
     else
@@ -910,8 +910,8 @@ bool ObjCMethod::isEqualTo(const Type *other) const
     if (! o)
         return false;
 
-    const Name *l = identity();
-    const Name *r = o->identity();
+    const Name *l = unqualifiedName();
+    const Name *r = o->unqualifiedName();
     if (l == r || (l && l->isEqualTo(r))) {
         if (argumentCount() != o->argumentCount())
             return false;
-- 
cgit v1.2.1