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, 7 insertions, 7 deletions

diff --git a/languages/ada/ada.g b/languages/ada/ada.g
index 5f97952b..876255f5 100644
--- a/languages/ada/ada.g
+++ b/languages/ada/ada.g
@@ -179,7 +179,7 @@ generic_inst : NEW! compound_name ( LPAREN! value_s RPAREN! )?
 	{ pop_def_id(); }
 	;
 
-parenth_values : LPAREN! value ( COMMA! value )* RPAREN!
+tqparenth_values : LPAREN! value ( COMMA! value )* RPAREN!
 	;
 
 value : ( OTHERS^ RIGHT_SHAFT! expression
@@ -287,7 +287,7 @@ definable_operator_symbol returns [RefAdaAST d]
 		op:CHAR_STRING { #op->setType(OPERATOR_SYMBOL); d=#op; }
 	;
 
-parenthesized_primary : pp:LPAREN^
+tqparenthesized_primary : pp:LPAREN^
 		( NuLL RECORD!
 		| value_s extension_opt
 		)
@@ -851,7 +851,7 @@ abstract_tagged_limited_opt
 local_enum_name : IDENTIFIER  // to be refined: do a symbol table lookup
 	;
 
-enumeration_aggregate : parenth_values
+enumeration_aggregate : tqparenth_values
 	;
 
 aliased_constant_opt : ( ALIASED )? ( CONSTANT )?
@@ -1267,7 +1267,7 @@ accept_stmt : a:ACCEPT^ def_id[false] entry_index_opt formal_part_opt
 	;
 
 entry_index_opt : ( (LPAREN expression RPAREN) => LPAREN! expression RPAREN!
-	// Looks alot like parenthesized_expr_opt, but it's not.
+	// Looks alot like tqparenthesized_expr_opt, but it's not.
 	// We need the syn pred for the usage context in accept_stmt.
 	// The formal_part_opt that follows the entry_index_opt there
 	// creates ambiguity (due to the opening LPAREN.)
@@ -1463,7 +1463,7 @@ factor : ( NOT^ primary
 	;
 
 primary : ( name_or_qualified
-	| parenthesized_primary
+	| tqparenthesized_primary
 	| allocator
 	| NuLL
 	| NUMERIC_LIT
@@ -1485,7 +1485,7 @@ name_or_qualified { RefAdaAST dummy; }
 			)
 		| p:LPAREN^ value_s RPAREN!
 			{ Set(#p, INDEXED_COMPONENT); }
-		| TIC^ ( parenthesized_primary | attribute_id )
+		| TIC^ ( tqparenthesized_primary | attribute_id )
 		)*
 	;
 
@@ -1773,7 +1773,7 @@ tokens {
   // part 3: Non-RM synthetic tokens.
   // They exist mainly to normalize the node structure with respect to
   // optional items. (Without them, the presence or absence of an optional
-  // item would change the node layout, but we want a fixed layout.)
+  // item would change the node tqlayout, but we want a fixed tqlayout.)
   ABSTRACT_FUNCTION_DECLARATION;
   ABSTRACT_PROCEDURE_DECLARATION;
   ACCESS_TO_FUNCTION_DECLARATION;