From b39020d3428c4ecb942ef45a0d1fab3931decffb Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 5 Aug 2011 17:12:16 +0000
Subject: [PATCH] Fix missing Q_OBJECT macros

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1245170 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h    | 3 ++-
 umbrello/umbrello/codeimport/kdevcppparser/lexer.h    | 1 +
 umbrello/umbrello/codeimport/kdevcppparser/parser.cpp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
index 3036f70c..cbf1d2e6 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
@@ -71,7 +71,8 @@ class MessagesSource
 
 class PoScanner : public TQObject
 {
-    TQ_OBJECT;
+    Q_OBJECT
+    TQ_OBJECT
     
     public:
     
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 ){