diff options
| -rw-r--r-- | languages/cpp/cppimplementationwidget.cpp | 2 | ||||
| -rw-r--r-- | languages/cpp/cppnewclassdlg.cpp | 2 | ||||
| -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 |
6 files changed, 6 insertions, 3 deletions
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index b67597e6..0912678c 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -43,7 +43,7 @@ CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, TQStringList CppImplementationWidget::createClassFiles() { - TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n"; TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n :$BASECLASSNAME$(tqparent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n"; diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 773f36ae..14d3cd49 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -2013,7 +2013,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString qobjectStr; if ( childClass || qobject ) - qobjectStr = "TQ_OBJECT"; + qobjectStr = "Q_OBJECT\nTQ_OBJECT"; TQString baseclass; 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 ){ |