diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:09:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:09:32 -0600 |
| commit | 0fed1a188b8d8be416550c63e2d5954f06434386 (patch) | |
| tree | 19f346183997f815423bd63cb9f2e86baa1f3b14 /lib/cppparser | |
| parent | 01b73b195ac252a67a00cfa0fa6a1ce4555f7304 (diff) | |
| download | tdevelop-0fed1a188b8d8be416550c63e2d5954f06434386.tar.gz tdevelop-0fed1a188b8d8be416550c63e2d5954f06434386.zip | |
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'lib/cppparser')
| -rw-r--r-- | lib/cppparser/driver.cpp | 2 | ||||
| -rw-r--r-- | lib/cppparser/keywords.h | 2 | ||||
| -rw-r--r-- | lib/cppparser/lexer.h | 2 | ||||
| -rw-r--r-- | lib/cppparser/parser.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 91945e53..01d7c5cd 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -598,7 +598,7 @@ void Driver::setupLexer( Lexer * lexer ) { // qt lexer->addSkipWord( "Q_OBJECT" ); - lexer->addSkipWord( "TQ_OBJECT" ); + lexer->addSkipWord( "" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index 34aabd3c..5c48324d 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -10,7 +10,7 @@ INSERT( "k_dcop_signals", Token_k_dcop_signals ); // TQt Keywords INSERT( "Q_OBJECT", Token_Q_OBJECT ); -INSERT( "TQ_OBJECT", Token_TQ_OBJECT ); +INSERT( "", Token_ ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); INSERT( "emit", Token_emit ); diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 12f16696..047fc864 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -61,7 +61,7 @@ enum Type { Token_k_dcop_signals, Token_Q_OBJECT, - Token_TQ_OBJECT, + Token_, Token_signals, Token_slots, Token_emit, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 08b4e6bb..a9b77ed2 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_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_ || 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 ){ |