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

diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp
index 172f4a49..80655b41 100644
--- a/languages/pascal/PascalParser.cpp
+++ b/languages/pascal/PascalParser.cpp
@@ -1193,7 +1193,7 @@ void PascalParser::constantDeclarationPart() {
 		{ // ( ... )+
 		int _cnt47=0;
 		for (;;) {
-			if ((LA(1) == IDENT) && (LA(2) == EQUAL)) {
+			if ((LA(1) == IDENT) && (LA(2) == ETQUAL)) {
 				constantDeclaration();
 				if (inputState->guessing==0) {
 					astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1581,7 +1581,7 @@ void PascalParser::constantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		expression();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1615,7 +1615,7 @@ void PascalParser::typedConstantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		typedConstant();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1644,7 +1644,7 @@ void PascalParser::stringConstantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		string();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1697,7 +1697,7 @@ void PascalParser::typeDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		type();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1771,7 +1771,7 @@ void PascalParser::type() {
 		case BYTE:
 		case WORD:
 		case CARDINAL:
-		case QWORD:
+		case TQWORD:
 		case BOOLEAN:
 		case BYTEBOOL:
 		case LONGBOOL:
@@ -3234,7 +3234,7 @@ void PascalParser::expression() {
 		}
 		{
 		switch ( LA(1)) {
-		case EQUAL:
+		case ETQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -3717,7 +3717,7 @@ void PascalParser::simpleType() {
 		case BYTE:
 		case WORD:
 		case CARDINAL:
-		case QWORD:
+		case TQWORD:
 		case BOOLEAN:
 		case BYTEBOOL:
 		case LONGBOOL:
@@ -3783,7 +3783,7 @@ void PascalParser::subrangeTypeOrTypeIdentifier() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -3891,7 +3891,7 @@ void PascalParser::stringType() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -4154,9 +4154,9 @@ void PascalParser::ordinalType() {
 			ordinalType_AST = RefPascalAST(currentAST.root);
 			break;
 		}
-		case QWORD:
+		case TQWORD:
 		{
-			match(QWORD);
+			match(TQWORD);
 			ordinalType_AST = RefPascalAST(currentAST.root);
 			break;
 		}
@@ -5033,7 +5033,7 @@ void PascalParser::proceduralTypePart1() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -6535,9 +6535,9 @@ void PascalParser::expressionSign() {
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
-		case EQUAL:
+		case ETQUAL:
 		{
-			match(EQUAL);
+			match(ETQUAL);
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
@@ -8571,7 +8571,7 @@ void PascalParser::operatorDefinition() {
 			}
 			break;
 		}
-		case EQUAL:
+		case ETQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -8707,9 +8707,9 @@ void PascalParser::comparisonOperatorDefinition() {
 	try {      // for error handling
 		{
 		switch ( LA(1)) {
-		case EQUAL:
+		case ETQUAL:
 		{
-			match(EQUAL);
+			match(ETQUAL);
 			break;
 		}
 		case LE:
@@ -9283,7 +9283,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"label\"",
 	"\"const\"",
 	"\"resourcestring\"",
-	"EQUAL",
+	"ETQUAL",
 	"\"type\"",
 	"\"var\"",
 	"COLON",
@@ -9417,7 +9417,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"self\"",
 	"METHOD",
 	"ADDSUBOR",
-	"ASSIGNEQUAL",
+	"ASSIGNETQUAL",
 	"SIGN",
 	"FUNC",
 	"NODE_NOT_EMIT",
@@ -9450,7 +9450,7 @@ const unsigned long PascalParser::_tokenSet_3_data_[] = { 121634818UL, 177988UL,
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_3(_tokenSet_3_data_,8);
 const unsigned long PascalParser::_tokenSet_4_data_[] = { 994050050UL, 706736UL, 101056512UL, 4294963649UL, 833972167UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" COMMA "index" "name" LPAREN RPAREN "finalization" 
-// EQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK 
+// ETQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK 
 // POINTER "constructor" "destructor" "class" "property" "read" "write" 
 // "default" "nodefault" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" AT PLUSEQ MINUSEQ STAREQ 
@@ -9515,7 +9515,7 @@ const unsigned long PascalParser::_tokenSet_20_data_[] = { 100663296UL, 177988UL
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_20(_tokenSet_20_data_,12);
 const unsigned long PascalParser::_tokenSet_21_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" 
@@ -9525,7 +9525,7 @@ const unsigned long PascalParser::_tokenSet_22_data_[] = { 16777216UL, 0UL, 0UL,
 // SEMI 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_22(_tokenSet_22_data_,6);
 const unsigned long PascalParser::_tokenSet_23_data_[] = { 16777216UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI RPAREN EQUAL RBRACK 
+// SEMI RPAREN ETQUAL RBRACK 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_23(_tokenSet_23_data_,8);
 const unsigned long PascalParser::_tokenSet_24_data_[] = { 0UL, 4UL, 536870920UL, 0UL, 206215168UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // "begin" NUM_INT "case" "goto" "if" "while" "repeat" "for" "with" "raise" 
@@ -9538,7 +9538,7 @@ const unsigned long PascalParser::_tokenSet_25_data_[] = { 121634818UL, 178116UL
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_25(_tokenSet_25_data_,12);
 const unsigned long PascalParser::_tokenSet_26_data_[] = { 16777216UL, 1818406UL, 67108864UL, 192UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI "implementation" "begin" RPAREN "label" "const" "resourcestring" 
-// EQUAL "type" "var" "procedure" "forward" "function" "of" "external" 
+// ETQUAL "type" "var" "procedure" "forward" "function" "of" "external" 
 // RBRACK "constructor" "destructor" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_26(_tokenSet_26_data_,8);
 const unsigned long PascalParser::_tokenSet_27_data_[] = { 117440514UL, 177988UL, 0UL, 192UL, 0UL, 0UL, 0UL, 0UL };
@@ -9579,22 +9579,22 @@ const unsigned long PascalParser::_tokenSet_36_data_[] = { 0UL, 16UL, 33554440UL
 // "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_36(_tokenSet_36_data_,12);
 const unsigned long PascalParser::_tokenSet_37_data_[] = { 16777216UL, 2064UL, 100663304UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI LPAREN EQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// SEMI LPAREN ETQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
 // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" 
 // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_37(_tokenSet_37_data_,12);
 const unsigned long PascalParser::_tokenSet_38_data_[] = { 184549378UL, 182304UL, 67239936UL, 4544UL, 0UL, 0UL, 0UL, 0UL };
-// EOF SEMI "end" COMMA RPAREN EQUAL COLON "procedure" "function" DOTDOT 
+// EOF SEMI "end" COMMA RPAREN ETQUAL COLON "procedure" "function" DOTDOT 
 // RBRACK "constructor" "destructor" "class" "property" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_38(_tokenSet_38_data_,8);
 const unsigned long PascalParser::_tokenSet_39_data_[] = { 150994944UL, 32UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI COMMA RPAREN 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_39(_tokenSet_39_data_,6);
 const unsigned long PascalParser::_tokenSet_40_data_[] = { 150994944UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI COMMA RPAREN EQUAL RBRACK 
+// SEMI COMMA RPAREN ETQUAL RBRACK 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_40(_tokenSet_40_data_,8);
 const unsigned long PascalParser::_tokenSet_41_data_[] = { 318767104UL, 165936UL, 67108864UL, 127424UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI "end" "index" LPAREN RPAREN EQUAL "procedure" "function" RBRACK 
+// SEMI "end" "index" LPAREN RPAREN ETQUAL "procedure" "function" RBRACK 
 // "constructor" "destructor" "class" "property" "read" "write" "default" 
 // "nodefault" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_41(_tokenSet_41_data_,8);
@@ -9603,7 +9603,7 @@ const unsigned long PascalParser::_tokenSet_42_data_[] = { 0UL, 32UL, 0UL, 0UL,
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_42(_tokenSet_42_data_,6);
 const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL, 67239936UL, 4294963648UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" "read" "write" "default" "nodefault" LE GE LTH GT 
 // NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" 
@@ -9611,7 +9611,7 @@ const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL
 // "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_43(_tokenSet_43_data_,12);
 const unsigned long PascalParser::_tokenSet_44_data_[] = { 0UL, 2064UL, 100794376UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// LPAREN EQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// LPAREN ETQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
 // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" 
 // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_44(_tokenSet_44_data_,12);
@@ -9660,23 +9660,23 @@ const unsigned long PascalParser::_tokenSet_57_data_[] = { 33554432UL, 163840UL,
 // "default" "nodefault" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_57(_tokenSet_57_data_,8);
 const unsigned long PascalParser::_tokenSet_58_data_[] = { 188743680UL, 526496UL, 67239936UL, 16646144UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" "then" "else" "do" "until" "to" "downto" 
 // RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_58(_tokenSet_58_data_,12);
 const unsigned long PascalParser::_tokenSet_59_data_[] = { 188743680UL, 526496UL, 67239936UL, 268304384UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" "then" "else" 
 // "do" "until" "to" "downto" RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_59(_tokenSet_59_data_,12);
 const unsigned long PascalParser::_tokenSet_60_data_[] = { 188743680UL, 526512UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" EQUAL "of" DOTDOT 
+// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" ETQUAL "of" DOTDOT 
 // RBRACK LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH 
 // "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" 
 // RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_60(_tokenSet_60_data_,12);
 const unsigned long PascalParser::_tokenSet_61_data_[] = { 188743680UL, 526496UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" 
 // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2 
 // "except" "finally" 
@@ -9727,14 +9727,14 @@ const unsigned long PascalParser::_tokenSet_74_data_[] = { 0UL, 0UL, 8UL, 0UL, 0
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_74(_tokenSet_74_data_,12);
 const unsigned long PascalParser::_tokenSet_75_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" 
 // "to" "downto" RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_75(_tokenSet_75_data_,12);
 const unsigned long PascalParser::_tokenSet_76_data_[] = { 188743682UL, 706720UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// EOF DOT SEMI "end" COMMA RPAREN "finalization" EQUAL COLON "procedure" 
+// EOF DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL COLON "procedure" 
 // "function" "of" DOTDOT RBRACK "constructor" "destructor" "class" "property" 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" 
 // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2