1 files changed, 6 insertions, 10 deletions

diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index c1a6f55a..aec21887 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -101,7 +101,7 @@ class DefaultSourceProvider: public SourceProvider {
 
 
 Driver::Driver()
-  : depresolv( FALSE ), lexer( 0 ), m_lexerCache( this ), m_dependenceDepth( 0 ), m_maxDependenceDepth( 20 ) {
+  : depresolv( false ), lexer( 0 ), m_lexerCache( this ), m_dependenceDepth( 0 ), m_maxDependenceDepth( 20 ) {
   m_sourceProvider = new DefaultSourceProvider();
 }
 
@@ -552,7 +552,6 @@ void Driver::setupLexer( Lexer * lexer ) {
   lexer->addSkipWord( "ANTLR_USE_NAMESPACE", SkipWordAndArguments );
   lexer->addSkipWord( "ANTLR_USING_NAMESPACE", SkipWordAndArguments );
   lexer->addSkipWord( "ANTLR_END_NAMESPACE" );
-  lexer->addSkipWord( "ANTLR_C_USING", SkipWordAndArguments );
   lexer->addSkipWord( "ANTLR_API" );
 
   // gnu
@@ -594,10 +593,10 @@ void Driver::setupLexer( Lexer * lexer ) {
   lexer->addSkipWord( "EXPORT_DOCKCLASS" );
   lexer->addSkipWord( "K_EXPORT_COMPONENT_FACTORY", SkipWordAndArguments );
   lexer->addSkipWord( "K_SYCOCAFACTORY", SkipWordAndArguments );
-  lexer->addSkipWord( "KDE_DEPRECATED" );
+  lexer->addSkipWord( "TDE_DEPRECATED" );
 
   // qt
-  lexer->addSkipWord( "Q_OBJECT" );
+  lexer->addSkipWord( "TQ_OBJECT" );
   lexer->addSkipWord( "" );
   lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments );
   lexer->addSkipWord( "TQ_ENUMS", SkipWordAndArguments );
@@ -606,25 +605,22 @@ void Driver::setupLexer( Lexer * lexer ) {
   lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments );
   lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments );
   lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments );
-  lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments );
   lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments );
-  lexer->addSkipWord( "TQ_INLINE_TEMPLATES" );
   lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" );
   lexer->addSkipWord( "TQ_TYPENAME" );
   lexer->addSkipWord( "TQ_REFCOUNT" );
-  lexer->addSkipWord( "TQ_EXPLICIT" );
   lexer->addSkipWord( "QMAC_PASCAL" );
-  lexer->addSkipWord( "QT_STATIC_CONST" );
-  lexer->addSkipWord( "QT_STATIC_CONST_IMPL" );
   lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" );
   lexer->addSkipWord( "TQT_NC_MSGBOX" );
   lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments );
   lexer->addSkipWord( "CALLBACK_CALL_TYPE" );
 
-  // qt4 [erbsland]
   lexer->addSkipWord( "TQ_DECLARE_FLAGS", SkipWordAndArguments );
   lexer->addSkipWord( "TQ_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments );
 
+  // historical
+  lexer->addSkipWord( "TQ_INLINE_TEMPLATES" );
+
   // flex
   lexer->addSkipWord( "yyconst" );
   lexer->addSkipWord( "YY_RULE_SETUP" );