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

Merge CPlusPlus::NameId and CPlusPlus::Identifier.

Browse Source
This commit is contained in:
Roberto Raggi
2010-09-02 11:59:01 +02:00
parent 8b2eeb9c5f
commit c12866a467
25 changed files with 69 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
View File

@@ -231,7 +231,7 @@ private:
return previousType;
}
virtual void visit(const NameId *name)
virtual void visit(const Identifier *name)
{
int index = findSubstitution(name->identifier());
@@ -261,10 +261,9 @@ private:
if (! name)
return name;
else if (const Name *nameId = name->asNameId()) {
const Identifier *id = control()->identifier(nameId->identifier()->chars(),
nameId->identifier()->size());
return control()->nameId(id);
else if (const Identifier *nameId = name->asNameId()) {
const Identifier *id = control()->identifier(nameId->chars(), nameId->size());
return id;
} else if (const TemplateNameId *templId = name->asTemplateNameId()) {
QVarLengthArray<FullySpecifiedType, 8> arguments(templId->templateArgumentCount());