summaryrefslogtreecommitdiffstats
path: root/umbrello
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-05 17:12:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-05 17:12:16 +0000
commitb39020d3428c4ecb942ef45a0d1fab3931decffb (patch)
tree71b3e75f2bd290081a1ab29176354ff200de06d9 /umbrello
parenta2293395d6cf67e50a737c65bc8e49f230d48d9a (diff)
downloadtdesdk-b39020d3428c4ecb942ef45a0d1fab3931decffb.tar.gz
tdesdk-b39020d3428c4ecb942ef45a0d1fab3931decffb.zip
Fix missing Q_OBJECT macros
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1245170 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'umbrello')
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.h1
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/parser.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
index 541626d4..3b26fb0c 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
@@ -56,6 +56,7 @@ enum Type {
Token_k_dcop,
Token_k_dcop_signals,
+ Token_Q_OBJECT,
Token_TQ_OBJECT,
Token_signals,
Token_slots,
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 89b0852a..066ff36b 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -1980,7 +1980,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node )
if ( !comment.isEmpty() )
node->setComment( comment );
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 ){
lex->nextToken();
return true;
} else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){