Some cleanup in the C++ AST.

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index 56869fe1010..c1caa651d72 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -641,17 +641,17 @@ void tst_AST::cpp_initializer_or_function_declaration()
     FunctionDeclaratorAST *fun_declarator = declarator->postfix_declarator_list->value->asFunctionDeclarator();
     QVERIFY(fun_declarator != 0);
     QCOMPARE(fun_declarator->lparen_token, 3U);
-    QVERIFY(fun_declarator->parameters != 0);
+    QVERIFY(fun_declarator->parameter_declaration_clause != 0);
     QCOMPARE(fun_declarator->rparen_token, 5U);
 
     // check the formal arguments
-    ParameterDeclarationClauseAST *param_clause = fun_declarator->parameters;
+    ParameterDeclarationClauseAST *param_clause = fun_declarator->parameter_declaration_clause;
     QVERIFY(param_clause->parameter_declaration_list != 0);
     QVERIFY(param_clause->parameter_declaration_list->next == 0);
     QCOMPARE(param_clause->dot_dot_dot_token, 0U);
 
     // check the parameter
-    DeclarationListAST *declarations = param_clause->parameter_declaration_list;
+    ParameterDeclarationListAST *declarations = param_clause->parameter_declaration_list;
     QVERIFY(declarations);
     QVERIFY(declarations->value);
     QVERIFY(! declarations->next);
diff --git a/tests/manual/cplusplus-dump/dumpers.inc b/tests/manual/cplusplus-dump/dumpers.inc
index 99e69a2a494..c3d4635ee3f 100644
--- a/tests/manual/cplusplus-dump/dumpers.inc
+++ b/tests/manual/cplusplus-dump/dumpers.inc
@@ -172,7 +172,7 @@ virtual bool visit(QtPrivateSlotAST *ast)
         terminal(ast->dptr_rparen_token, ast);
     if (ast->comma_token)
         terminal(ast->comma_token, ast);
-    for (SpecifierListAST *iter = ast->type_specifiers; iter; iter = iter->next)
+    for (SpecifierListAST *iter = ast->type_specifier_list; iter; iter = iter->next)
         nonterminal(iter->value);
     nonterminal(ast->declarator);
     if (ast->rparen_token)
@@ -196,7 +196,7 @@ virtual bool visit(QtPropertyDeclarationAST *ast)
         terminal(ast->lparen_token, ast);
     nonterminal(ast->type_id);
     nonterminal(ast->property_name);
-    for (QtPropertyDeclarationItemListAST *iter = ast->property_declaration_items; iter; iter = iter->next)
+    for (QtPropertyDeclarationItemListAST *iter = ast->property_declaration_item_list; iter; iter = iter->next)
         nonterminal(iter->value);
     if (ast->rparen_token)
         terminal(ast->rparen_token, ast);
@@ -466,7 +466,7 @@ virtual bool visit(FunctionDeclaratorAST *ast)
 {
     if (ast->lparen_token)
         terminal(ast->lparen_token, ast);
-    nonterminal(ast->parameters);
+    nonterminal(ast->parameter_declaration_clause);
     if (ast->rparen_token)
         terminal(ast->rparen_token, ast);
     for (SpecifierListAST *iter = ast->cv_qualifier_list; iter; iter = iter->next)
@@ -893,7 +893,7 @@ virtual bool visit(ParameterDeclarationAST *ast)
 
 virtual bool visit(ParameterDeclarationClauseAST *ast)
 {
-    for (DeclarationListAST *iter = ast->parameter_declaration_list; iter; iter = iter->next)
+    for (ParameterDeclarationListAST *iter = ast->parameter_declaration_list; iter; iter = iter->next)
         nonterminal(iter->value);
     if (ast->dot_dot_dot_token)
         terminal(ast->dot_dot_dot_token, ast);
@@ -1594,7 +1594,7 @@ virtual bool visit(TrailingReturnTypeAST *ast)
         terminal(ast->arrow_token, ast);
     for (SpecifierListAST *iter = ast->attributes; iter; iter = iter->next)
         nonterminal(iter->value);
-    for (SpecifierListAST *iter = ast->type_specifiers; iter; iter = iter->next)
+    for (SpecifierListAST *iter = ast->type_specifier_list; iter; iter = iter->next)
         nonterminal(iter->value);
     nonterminal(ast->declarator);
     return false;