From ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 4 Feb 2010 12:03:34 +0100 Subject: 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. --- src/shared/cplusplus/Parser.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/shared/cplusplus/Parser.cpp') diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 61382f9f9d..cf32c5a336 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -3087,13 +3087,9 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, { DEBUG_THIS_RULE(); unsigned qt_invokable_token = 0; - if (acceptStructDeclarator && (LA() == T_Q_SIGNAL || LA() == T_Q_SLOT)) + if (acceptStructDeclarator + && (LA() == T_Q_SIGNAL || LA() == T_Q_SLOT || LA() == T_Q_INVOKABLE)) qt_invokable_token = consumeToken(); -#ifdef ICHECK_BUILD - unsigned invoke_token = 0; - if (LA() == T_Q_INVOKABLE) - invoke_token = consumeToken(); -#endif // parse a simple declaration, a function definition, // or a contructor declaration. -- cgit v1.2.1