forked from qt-creator/qt-creator
Merge CPlusPlus::NameId and CPlusPlus::Identifier.
This commit is contained in:
@@ -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"));
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user