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.
This commit is contained in:
Erik Verbruggen
2010-02-04 12:03:34 +01:00
parent 1b5168c19e
commit ae0ee18a77
13 changed files with 87 additions and 68 deletions

View File

@@ -171,7 +171,7 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
const bool isQ_SLOT = ast->qt_invokable_token && tokenKind(ast->qt_invokable_token) == T_Q_SLOT;
const bool isQ_SIGNAL = ast->qt_invokable_token && tokenKind(ast->qt_invokable_token) == T_Q_SIGNAL;
#ifdef ICHECK_BUILD
const bool isQ_INVOKABLE = (ast->invoke_token > 0);
const bool isQ_INVOKABLE = ast->qt_invokable_token && tokenKind(ast->qt_invokable_token) == T_Q_INVOKABLE;
#endif
List<Declaration *> **decl_it = &ast->symbols;