From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 lib/cppparser/parser.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/cppparser/parser.cpp')

diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index 31c14385..77265ce6 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
       return false; \
   } \
   nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
   } \
   else \
       nextToken(); \
@@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
     }
 
     return true;
@@ -216,8 +216,8 @@ bool Parser::skipUntilDeclaration()
 	case Token_public:
 	case Token_protected:
 	case Token_private:
-	case Token_signals:      // Qt
-	case Token_slots:        // Qt
+	case Token_signals:      // TQt
+	case Token_slots:        // TQt
   	    return true;
 
 	default:
@@ -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_K_DCOP ){
+    } else if( 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 ){
-- 
cgit v1.2.1