diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-02-03 13:21:08 +1000 |
|---|---|---|
| committer | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-02-03 13:21:08 +1000 |
| commit | e134e249196fdc86eb7a87a109e9772c9fed82a8 (patch) | |
| tree | 614777bd1e0c2ee2193a721fb73d4e273bad5ff9 /src/shared/cplusplus/Parser.cpp | |
| parent | cc278a593b829417ae210a8e21c49d1dade88b32 (diff) | |
| download | qt-creator-e134e249196fdc86eb7a87a109e9772c9fed82a8.tar.gz | |
Source update.
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
| -rw-r--r-- | src/shared/cplusplus/Parser.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 61efa2baa8..573ad6140e 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -1748,11 +1748,12 @@ bool Parser::parseAccessSpecifier(SpecifierAST *&node) bool Parser::parseAccessDeclaration(DeclarationAST *&node) { DEBUG_THIS_RULE(); - if (LA() == T_PUBLIC || LA() == T_PROTECTED || LA() == T_PRIVATE || LA() == T_Q_SIGNALS) { + if (LA() == T_PUBLIC || LA() == T_PROTECTED || LA() == T_PRIVATE || LA() == T_Q_SIGNALS || LA() == T_Q_SLOTS) { bool isSignals = LA() == T_Q_SIGNALS; + bool isSlots = LA() == T_Q_SLOTS; AccessDeclarationAST *ast = new (_pool) AccessDeclarationAST; ast->access_specifier_token = consumeToken(); - if (! isSignals && LA() == T_Q_SLOTS) + if (! isSignals && (LA() == T_Q_SLOTS || isSlots)) ast->slots_token = consumeToken(); match(T_COLON, &ast->colon_token); node = ast; @@ -1930,6 +1931,7 @@ bool Parser::parseMemberSpecification(DeclarationAST *&node) case T_PUBLIC: case T_PROTECTED: case T_PRIVATE: + case T_Q_SLOTS: return parseAccessDeclaration(node); #ifdef ICHECK_BUILD @@ -2426,6 +2428,7 @@ bool Parser::parseStatement(StatementAST *&node) return parseExpressionOrDeclarationStatement(node); } // switch + return false; //Avoid compiler warning } bool Parser::parseBreakStatement(StatementAST *&node) |