diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-04 12:03:34 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-04 12:15:32 +0100 |
| commit | ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7 (patch) | |
| tree | e6d3585aa9d457b769436a83e47c063bf381b1f6 /src/shared/cplusplus/Parser.cpp | |
| parent | 1b5168c19e8dd22b4c5192108415995ffa4dcd43 (diff) | |
| download | qt-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/Parser.cpp')
| -rw-r--r-- | src/shared/cplusplus/Parser.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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. |