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

1 files changed, 19 insertions, 19 deletions

diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp
index e783595e..3656446e 100644
--- a/languages/ada/AdaParser.cpp
+++ b/languages/ada/AdaParser.cpp
@@ -1954,10 +1954,10 @@ void AdaParser::value_s() {
 	returnAST = value_s_AST;
 }
 
-void AdaParser::parenth_values() {
+void AdaParser::tqparenth_values() {
 	returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
-	RefAdaAST parenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
+	RefAdaAST tqparenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
 	match(LPAREN);
 	value();
@@ -1981,8 +1981,8 @@ void AdaParser::parenth_values() {
 	_loop46:;
 	} // ( ... )*
 	match(RPAREN);
-	parenth_values_AST = RefAdaAST(currentAST.root);
-	returnAST = parenth_values_AST;
+	tqparenth_values_AST = RefAdaAST(currentAST.root);
+	returnAST = tqparenth_values_AST;
 }
 
 void AdaParser::value() {
@@ -2869,10 +2869,10 @@ RefAdaAST  AdaParser::is_operator() {
 	return d;
 }
 
-void AdaParser::parenthesized_primary() {
+void AdaParser::tqparenthesized_primary() {
 	returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
-	RefAdaAST parenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
+	RefAdaAST tqparenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)RefToken  pp = ANTLR_USE_NAMESPACE(antlr)nullToken;
 	RefAdaAST pp_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
@@ -2913,8 +2913,8 @@ void AdaParser::parenthesized_primary() {
 		Set(pp_AST, PARENTHESIZED_PRIMARY);
 #line 2915 "AdaParser.cpp"
 	}
-	parenthesized_primary_AST = RefAdaAST(currentAST.root);
-	returnAST = parenthesized_primary_AST;
+	tqparenthesized_primary_AST = RefAdaAST(currentAST.root);
+	returnAST = tqparenthesized_primary_AST;
 }
 
 void AdaParser::extension_opt() {
@@ -5643,7 +5643,7 @@ void AdaParser::enumeration_aggregate() {
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
 	RefAdaAST enumeration_aggregate_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
-	parenth_values();
+	tqparenth_values();
 	if (inputState->guessing==0) {
 		astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 	}
@@ -8484,7 +8484,7 @@ void AdaParser::statements() {
 		case SELECT:
 		case ABORT:
 		case RAISE:
-		case REQUEUE:
+		case RETQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -8601,7 +8601,7 @@ void AdaParser::handled_stmts_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		statements();
 		if (inputState->guessing==0) {
@@ -8708,7 +8708,7 @@ void AdaParser::statement() {
 		}
 		break;
 	}
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		requeue_stmt();
 		if (inputState->guessing==0) {
@@ -8878,7 +8878,7 @@ void AdaParser::def_label_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		break;
 	}
@@ -9207,7 +9207,7 @@ void AdaParser::requeue_stmt() {
 		r_AST = astFactory->create(r);
 		astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(r_AST));
 	}
-	match(REQUEUE);
+	match(RETQUEUE);
 	name();
 	if (inputState->guessing==0) {
 		astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -9238,7 +9238,7 @@ void AdaParser::requeue_stmt() {
 	match(SEMI);
 	if ( inputState->guessing==0 ) {
 #line 1393 "ada.g"
-		Set (r_AST, REQUEUE_STATEMENT);
+		Set (r_AST, RETQUEUE_STATEMENT);
 #line 9243 "AdaParser.cpp"
 	}
 	requeue_stmt_AST = RefAdaAST(currentAST.root);
@@ -10517,7 +10517,7 @@ void AdaParser::stmts_opt() {
 		case SELECT:
 		case ABORT:
 		case RAISE:
-		case REQUEUE:
+		case RETQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -11401,7 +11401,7 @@ void AdaParser::primary() {
 	}
 	case LPAREN:
 	{
-		parenthesized_primary();
+		tqparenthesized_primary();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
@@ -11623,7 +11623,7 @@ void AdaParser::name_or_qualified() {
 			switch ( LA(1)) {
 			case LPAREN:
 			{
-				parenthesized_primary();
+				tqparenthesized_primary();
 				if (inputState->guessing==0) {
 					astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 				}
@@ -12036,7 +12036,7 @@ const char* AdaParser::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"REQUEUE_STATEMENT",
+	"RETQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",