summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/ASTClone.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-02-04 12:03:34 +0100
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-02-04 12:15:32 +0100
commitae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7 (patch)
treee6d3585aa9d457b769436a83e47c063bf381b1f6 /src/shared/cplusplus/ASTClone.cpp
parent1b5168c19e8dd22b4c5192108415995ffa4dcd43 (diff)
downloadqt-creator-ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7.tar.gz
Removed #ifdefs so all AST nodes are always there.
Also removed the (conditional) invoke_token from DeclarationAST and use the qt_invokable_token to store the Q_INVOKABLE, and fixed the ASTMatch code generation.
Diffstat (limited to 'src/shared/cplusplus/ASTClone.cpp')
-rw-r--r--src/shared/cplusplus/ASTClone.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/shared/cplusplus/ASTClone.cpp
index ab79ef3578..a3bb26e7d6 100644
--- a/src/shared/cplusplus/ASTClone.cpp
+++ b/src/shared/cplusplus/ASTClone.cpp
@@ -138,7 +138,6 @@ AccessDeclarationAST *AccessDeclarationAST::clone(MemoryPool *pool) const
return ast;
}
-#ifdef ICHECK_BUILD
QPropertyDeclarationAST *QPropertyDeclarationAST::clone(MemoryPool *pool) const
{
QPropertyDeclarationAST *ast = new (pool) QPropertyDeclarationAST;
@@ -160,14 +159,13 @@ QPropertyDeclarationAST *QPropertyDeclarationAST::clone(MemoryPool *pool) const
QEnumDeclarationAST *QEnumDeclarationAST::clone(MemoryPool *pool) const
{
- QEnumDeclarationAST *ast = new (pool)QEnumDeclarationAST;
+ QEnumDeclarationAST *ast = new (pool) QEnumDeclarationAST;
ast->enum_specifier_token = enum_specifier_token;
ast->lparen_token = lparen_token;
ast->rparen_token = rparen_token;
for (EnumeratorListAST *iter = enumerator_list, **ast_iter = &ast->enumerator_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
*ast_iter = new (pool) EnumeratorListAST((iter->value) ? iter->value->clone(pool) : 0);
-
return ast;
}
@@ -180,7 +178,6 @@ QFlagsDeclarationAST *QFlagsDeclarationAST::clone(MemoryPool *pool) const
for (EnumeratorListAST *iter = enumerator_list, **ast_iter = &ast->enumerator_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
*ast_iter = new (pool) EnumeratorListAST((iter->value) ? iter->value->clone(pool) : 0);
-
return ast;
}
@@ -192,10 +189,8 @@ QDeclareFlagsDeclarationAST *QDeclareFlagsDeclarationAST::clone(MemoryPool *pool
ast->flag_token = flag_token;
ast->enum_token = enum_token;
ast->rparen_token = rparen_token;
-
return ast;
}
-#endif
AsmDefinitionAST *AsmDefinitionAST::clone(MemoryPool *pool) const
{