feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Renamed Symbol::identity() to Symbol::unqualifiedName().

Browse Source
This commit is contained in:
Roberto Raggi
2010-08-26 12:23:09 +02:00
parent e3551684ee
commit 988cc958ab
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/cplusplus/Scope.cpp
View File

@@ -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;

4
src/shared/cplusplus/Symbol.cpp
View File

@@ -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());
}
}

2
src/shared/cplusplus/Symbol.h
View File

@@ -276,7 +276,7 @@ public:
/// Returns this Symbol's index.
unsigned index() const;
const Name *identity() const;
const Name *unqualifiedName() const;
bool isGenerated() const;

28
src/shared/cplusplus/Symbols.cpp
View File

@@ -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;