diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-09-02 11:59:01 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-09-02 12:51:01 +0200 |
| commit | c12866a467459f51e33252d5629edb8fbcd2201a (patch) | |
| tree | e6f467fb02f751bed515d4348f7aa97119467af5 /src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp | |
| parent | 8b2eeb9c5f7f909a7067270854619af708e25e22 (diff) | |
Merge CPlusPlus::NameId and CPlusPlus::Identifier.
Diffstat (limited to 'src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp')
| -rw-r--r-- | src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp index 7edc44d7345..0247ba2c2db 100644 --- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp +++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp @@ -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()); |