diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-05 17:12:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-05 17:12:16 +0000 |
| commit | 093de0db4fea89b3f94a2359c6981f353d035eb7 (patch) | |
| tree | c8bc2c9eafdeb30b61da299945a8282d8bb668e6 /lib/cppparser | |
| parent | 03df9d8aeb40bdfb21f516a69a36ac4df6a90247 (diff) | |
| download | tdevelop-093de0db4fea89b3f94a2359c6981f353d035eb7.tar.gz tdevelop-093de0db4fea89b3f94a2359c6981f353d035eb7.zip | |
Fix missing Q_OBJECT macros
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1245170 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/cppparser')
| -rw-r--r-- | lib/cppparser/driver.cpp | 1 | ||||
| -rw-r--r-- | lib/cppparser/keywords.h | 1 | ||||
| -rw-r--r-- | lib/cppparser/lexer.h | 1 | ||||
| -rw-r--r-- | lib/cppparser/parser.cpp | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 52b196e5..b3ace734 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -597,6 +597,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "KDE_DEPRECATED" ); // qt + lexer->addSkipWord( "Q_OBJECT" ); lexer->addSkipWord( "TQ_OBJECT" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index e48107e0..34aabd3c 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -9,6 +9,7 @@ INSERT( "k_dcop", Token_k_dcop ); INSERT( "k_dcop_signals", Token_k_dcop_signals ); // TQt Keywords +INSERT( "Q_OBJECT", Token_Q_OBJECT ); INSERT( "TQ_OBJECT", Token_TQ_OBJECT ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index cbaed1be..7b104c76 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -60,6 +60,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, + Token_Q_OBJECT, Token_TQ_OBJECT, Token_signals, Token_slots, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 77265ce6..84ada9b2 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -2005,7 +2005,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if( lex->lookAhead(0) == ';' ){ nextToken(); return true; - } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ |