diff options
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 c08f0c1c..3dc8569c 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -597,7 +597,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "KDE_DEPRECATED" ); // qt - lexer->addSkipWord( "Q_OBJECT" ); + lexer->addSkipWord( "TQ_OBJECT" ); lexer->addSkipWord( "" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "TQ_ENUMS", SkipWordAndArguments ); diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index 5c48324d..385342fe 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -9,7 +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( "", Token_ ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 576c0cfa..b496afda 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -60,7 +60,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_, Token_signals, Token_slots, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 9c1b58b4..c4eccfd3 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_ || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_TQ_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 ){ |