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 /tests | |
| parent | 8b2eeb9c5f7f909a7067270854619af708e25e22 (diff) | |
Merge CPlusPlus::NameId and CPlusPlus::Identifier.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cplusplus/semantic/tst_semantic.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index a93b6ec3c6f..d504a6d3a25 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -179,7 +179,7 @@ void tst_Semantic::function_declaration_2() QVERIFY(! arg->hasInitializer()); // check the argument's name. - const NameId *argNameId = arg->name()->asNameId(); + const Identifier *argNameId = arg->name()->asNameId(); QVERIFY(argNameId); const Identifier *argId = argNameId->identifier(); @@ -243,7 +243,7 @@ void tst_Semantic::nested_class_1() Class *classObject = doc->globals->memberAt(0)->asClass(); QVERIFY(classObject); QVERIFY(classObject->name()); - const NameId *classObjectNameId = classObject->name()->asNameId(); + const Identifier *classObjectNameId = classObject->name()->asNameId(); QVERIFY(classObjectNameId); const Identifier *objectId = classObjectNameId->identifier(); QCOMPARE(QByteArray(objectId->chars(), objectId->size()), QByteArray("Object")); diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp index a4d6d3319ce..d3fda4748de 100644 --- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp +++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp @@ -31,8 +31,8 @@ Q_DECLARE_METATYPE(CPlusPlus::FullySpecifiedType); TranslationUnit *unit; -NameId *nameId(const QString &name) -{ return new NameId(new Identifier(name.toLatin1().constData(), name.toLatin1().size())); } +const Identifier *nameId(const QString &name) +{ return new Identifier(name.toLatin1().constData(), name.toLatin1().size()); } Argument *arg(const QString &name, const FullySpecifiedType &ty) { |