Fix inadvertent "TQ" changes.

32 files changed, 134 insertions, 134 deletions

diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp
index 0151bf29..40f2a589 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp
@@ -1011,7 +1011,7 @@ YY_RULE_SETUP
 {
     BEGIN(vallist);
     mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
-    return Parser::token::token::TQUOTED_VARIABLE_VALUE;
+    return Parser::token::token::QUOTED_VARIABLE_VALUE;
 }
 	YY_BREAK
 case 9:
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
index fed15b11..9757e3cf 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
@@ -238,7 +238,7 @@ namespace TQMake
      RCURLY = 271,
      LCURLY = 272,
      ID_ARGS = 273,
-     TQUOTED_VARIABLE_VALUE = 274,
+     QUOTED_VARIABLE_VALUE = 274,
      VARIABLE_VALUE = 275,
      LIST_WS = 276,
      ENDOFFILE = 277
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp
index bea6de16..e783595e 100644
--- a/languages/ada/AdaParser.cpp
+++ b/languages/ada/AdaParser.cpp
@@ -8484,7 +8484,7 @@ void AdaParser::statements() {
 		case SELECT:
 		case ABORT:
 		case RAISE:
-		case RETQUEUE:
+		case REQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -8601,7 +8601,7 @@ void AdaParser::handled_stmts_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case RETQUEUE:
+	case REQUEUE:
 	{
 		statements();
 		if (inputState->guessing==0) {
@@ -8708,7 +8708,7 @@ void AdaParser::statement() {
 		}
 		break;
 	}
-	case RETQUEUE:
+	case REQUEUE:
 	{
 		requeue_stmt();
 		if (inputState->guessing==0) {
@@ -8878,7 +8878,7 @@ void AdaParser::def_label_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case RETQUEUE:
+	case REQUEUE:
 	{
 		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(RETQUEUE);
+	match(REQUEUE);
 	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, RETQUEUE_STATEMENT);
+		Set (r_AST, REQUEUE_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 RETQUEUE:
+		case REQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -12036,7 +12036,7 @@ const char* AdaParser::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"RETQUEUE_STATEMENT",
+	"REQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp
index a15692b6..167d671c 100644
--- a/languages/ada/AdaStoreWalker.cpp
+++ b/languages/ada/AdaStoreWalker.cpp
@@ -6710,7 +6710,7 @@ void AdaStoreWalker::statement(RefAdaAST _t) {
 			_t = _retTree;
 			break;
 		}
-		case RETQUEUE_STATEMENT:
+		case REQUEUE_STATEMENT:
 		{
 			requeue_stmt(_t);
 			_t = _retTree;
@@ -7102,7 +7102,7 @@ void AdaStoreWalker::requeue_stmt(RefAdaAST _t) {
 	try {      // for error handling
 		RefAdaAST __t470 = _t;
 		RefAdaAST tmp233_AST_in = _t;
-		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),RETQUEUE_STATEMENT);
+		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),REQUEUE_STATEMENT);
 		_t = _t->getFirstChild();
 		name(_t);
 		_t = _retTree;
@@ -9271,7 +9271,7 @@ const char* AdaStoreWalker::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"RETQUEUE_STATEMENT",
+	"REQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.hpp
index bdaf1d2a..daaa4b21 100644
--- a/languages/ada/AdaStoreWalkerTokenTypes.hpp
+++ b/languages/ada/AdaStoreWalkerTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		RETQUEUE = 84,
+		REQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		RETQUEUE_STATEMENT = 169,
+		REQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.hpp
index 8ef62fbf..918b1cfd 100644
--- a/languages/ada/AdaTokenTypes.hpp
+++ b/languages/ada/AdaTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		RETQUEUE = 84,
+		REQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		RETQUEUE_STATEMENT = 169,
+		REQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp
index 76722b3e..be5f0623 100644
--- a/languages/ada/AdaTreeParserSuper.cpp
+++ b/languages/ada/AdaTreeParserSuper.cpp
@@ -6298,7 +6298,7 @@ void AdaTreeParserSuper::statement(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
 			_t = _retTree;
 			break;
 		}
-		case RETQUEUE_STATEMENT:
+		case REQUEUE_STATEMENT:
 		{
 			requeue_stmt(_t);
 			_t = _retTree;
@@ -6690,7 +6690,7 @@ void AdaTreeParserSuper::requeue_stmt(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
 	try {      // for error handling
 		ANTLR_USE_NAMESPACE(antlr)RefAST __t463 = _t;
 		ANTLR_USE_NAMESPACE(antlr)RefAST tmp231_AST_in = _t;
-		match(_t,RETQUEUE_STATEMENT);
+		match(_t,REQUEUE_STATEMENT);
 		_t = _t->getFirstChild();
 		name(_t);
 		_t = _retTree;
@@ -8882,7 +8882,7 @@ const char* AdaTreeParserSuper::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"RETQUEUE_STATEMENT",
+	"REQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.hpp
index 46edd24a..924b7415 100644
--- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp
+++ b/languages/ada/AdaTreeParserSuperTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		RETQUEUE = 84,
+		REQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		RETQUEUE_STATEMENT = 169,
+		REQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
index 5a5df025..a25f1fd2 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
@@ -211,7 +211,7 @@ void %{APPNAME}View::checkInput()
             }
             break;
 
-        case SDL_TQUIT:
+        case SDL_QUIT:
             exit(0);
             break;
         }
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index b0c3171e..15ebcdfc 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -1650,7 +1650,7 @@ void GDBController::removeStateReloadingCommands()
         GDBCommand* cmd = cmdList_.at(i);
         if (stateReloadingCommands_.count(cmd))
         {
-            kdDebug(9012) << "UNTQUEUE: " << cmd->initialString() << "\n";
+            kdDebug(9012) << "UNQUEUE: " << cmd->initialString() << "\n";
             delete cmdList_.take(i);
         }
     }
diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp
index f205ddd3..623e816f 100644
--- a/languages/java/JavaLexer.cpp
+++ b/languages/java/JavaLexer.cpp
@@ -275,7 +275,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken JavaLexer::nextToken()
 					theRetToken=_returnToken;
 				}
 				else if ((LA(1) == 0x3d /* '=' */ ) && (LA(2) == 0x3d /* '=' */ )) {
-					mETQUAL(true);
+					mEQUAL(true);
 					theRetToken=_returnToken;
 				}
 				else if ((LA(1) == 0x21 /* '!' */ ) && (LA(2) == 0x3d /* '=' */ )) {
@@ -571,9 +571,9 @@ void JavaLexer::mASSIGN(bool _createToken) {
 	_saveIndex=0;
 }
 
-void JavaLexer::mETQUAL(bool _createToken) {
+void JavaLexer::mEQUAL(bool _createToken) {
 	int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length();
-	_ttype = ETQUAL;
+	_ttype = EQUAL;
 	ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex;
 	
 	match("==");
diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.hpp
index 85d661be..9d185686 100644
--- a/languages/java/JavaLexer.hpp
+++ b/languages/java/JavaLexer.hpp
@@ -68,7 +68,7 @@ public:
 	public: void mCOLON(bool _createToken);
 	public: void mCOMMA(bool _createToken);
 	public: void mASSIGN(bool _createToken);
-	public: void mETQUAL(bool _createToken);
+	public: void mEQUAL(bool _createToken);
 	public: void mLNOT(bool _createToken);
 	public: void mBNOT(bool _createToken);
 	public: void mNOT_EQUAL(bool _createToken);
diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp
index eb17df00..1021c6a0 100644
--- a/languages/java/JavaRecognizer.cpp
+++ b/languages/java/JavaRecognizer.cpp
@@ -4181,7 +4181,7 @@ void JavaRecognizer::equalityExpression() {
 		}
 		{ // ( ... )*
 		for (;;) {
-			if ((LA(1) == NOT_EQUAL || LA(1) == ETQUAL)) {
+			if ((LA(1) == NOT_EQUAL || LA(1) == EQUAL)) {
 				{
 				switch ( LA(1)) {
 				case NOT_EQUAL:
@@ -4194,14 +4194,14 @@ void JavaRecognizer::equalityExpression() {
 					match(NOT_EQUAL);
 					break;
 				}
-				case ETQUAL:
+				case EQUAL:
 				{
 					RefJavaAST tmp139_AST = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 					if ( inputState->guessing == 0 ) {
 						tmp139_AST = astFactory->create(LT(1));
 						astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(tmp139_AST));
 					}
-					match(ETQUAL);
+					match(EQUAL);
 					break;
 				}
 				default:
@@ -4272,7 +4272,7 @@ void JavaRecognizer::relationalExpression() {
 		case BXOR:
 		case BAND:
 		case NOT_EQUAL:
-		case ETQUAL:
+		case EQUAL:
 		case LT_:
 		case GT:
 		case LE:
@@ -4969,7 +4969,7 @@ void JavaRecognizer::postfixExpression() {
 				case BXOR:
 				case BAND:
 				case NOT_EQUAL:
-				case ETQUAL:
+				case EQUAL:
 				case LT_:
 				case GT:
 				case LE:
@@ -5107,7 +5107,7 @@ void JavaRecognizer::postfixExpression() {
 					case BXOR:
 					case BAND:
 					case NOT_EQUAL:
-					case ETQUAL:
+					case EQUAL:
 					case LT_:
 					case GT:
 					case LE:
@@ -5235,7 +5235,7 @@ void JavaRecognizer::postfixExpression() {
 		case BXOR:
 		case BAND:
 		case NOT_EQUAL:
-		case ETQUAL:
+		case EQUAL:
 		case LT_:
 		case GT:
 		case LE:
@@ -5581,7 +5581,7 @@ void JavaRecognizer::newExpression() {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case ETQUAL:
+			case EQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -5651,7 +5651,7 @@ void JavaRecognizer::newExpression() {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case ETQUAL:
+			case EQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -6113,7 +6113,7 @@ const char* JavaRecognizer::tokenNames[] = {
 	"BXOR",
 	"BAND",
 	"NOT_EQUAL",
-	"ETQUAL",
+	"EQUAL",
 	"LT_",
 	"GT",
 	"LE",
@@ -6173,7 +6173,7 @@ const unsigned long JavaRecognizer::_tokenSet_4_data_[] = { 0UL, 67215360UL, 687
 // SEMI LBRACK RBRACK IDENT LCURLY RCURLY COMMA "implements" LPAREN RPAREN 
 // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN 
 // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION 
-// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_4(_tokenSet_4_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_5_data_[] = { 0UL, 8192UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI 
@@ -6204,13 +6204,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_9(_tokenSet_9_d
 const unsigned long JavaRecognizer::_tokenSet_10_data_[] = { 0UL, 67182592UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK IDENT RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_10(_tokenSet_10_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_11_data_[] = { 0UL, 201433088UL, 683008UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI LBRACK RBRACK IDENT DOT RCURLY COMMA LPAREN RPAREN ASSIGN COLON 
 // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_11(_tokenSet_11_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_12_data_[] = { 0UL, 32768UL, 8192UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // LBRACK LPAREN 
@@ -6235,7 +6235,7 @@ const unsigned long JavaRecognizer::_tokenSet_16_data_[] = { 2UL, 4294943616UL,
 // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" 
 // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6275,7 +6275,7 @@ const unsigned long JavaRecognizer::_tokenSet_22_data_[] = { 0UL, 4294878080UL,
 // COLON "if" "for" "while" "do" "break" "continue" "return" "switch" "throw" 
 // "try" PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR 
+// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR 
 // PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT 
 // CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_22(_tokenSet_22_data_,12);
@@ -6323,7 +6323,7 @@ const unsigned long JavaRecognizer::_tokenSet_29_data_[] = { 0UL, 4294878080UL,
 // COLON "if" "else" "for" "while" "do" "break" "continue" "return" "switch" 
 // "throw" "case" "default" "try" "finally" "catch" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6348,7 +6348,7 @@ const unsigned long JavaRecognizer::_tokenSet_33_data_[] = { 0UL, 536780800UL, 2
 // SEMI LBRACK "void" "boolean" "byte" "char" "short" "int" "float" "long" 
 // "double" IDENT DOT STAR LPAREN "this" "super" ASSIGN PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6377,7 +6377,7 @@ const unsigned long JavaRecognizer::_tokenSet_39_data_[] = { 0UL, 402759680UL, 6
 // SEMI LBRACK RBRACK DOT STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN 
 // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN 
 // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR 
-// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
+// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 // DIV MOD INC DEC 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_39(_tokenSet_39_data_,12);
 const unsigned long JavaRecognizer::_tokenSet_40_data_[] = { 0UL, 73728UL, 543744UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6395,7 +6395,7 @@ const unsigned long JavaRecognizer::_tokenSet_43_data_[] = { 0UL, 536780800UL, 2
 // "double" IDENT DOT STAR COMMA LPAREN "this" "super" ASSIGN PLUS_ASSIGN 
 // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN 
 // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR 
-// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
+// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 // DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL 
 // STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_43(_tokenSet_43_data_,12);
@@ -6467,18 +6467,18 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_55(_tokenSet_55
 const unsigned long JavaRecognizer::_tokenSet_56_data_[] = { 0UL, 73728UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_56(_tokenSet_56_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_57_data_[] = { 0UL, 73728UL, 674816UL, 134217720UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_57(_tokenSet_57_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_58_data_[] = { 0UL, 73728UL, 674816UL, 1073741816UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_58(_tokenSet_58_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_59_data_[] = { 0UL, 268435456UL, 0UL, 0UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6487,13 +6487,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_59(_tokenSet_59
 const unsigned long JavaRecognizer::_tokenSet_60_data_[] = { 0UL, 73728UL, 674816UL, 4294967288UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_60(_tokenSet_60_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_61_data_[] = { 0UL, 268509184UL, 674816UL, 4294967288UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_61(_tokenSet_61_data_,12);
 const unsigned long JavaRecognizer::_tokenSet_62_data_[] = { 0UL, 134086656UL, 106496UL, 0UL, 65472UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6506,7 +6506,7 @@ const unsigned long JavaRecognizer::_tokenSet_63_data_[] = { 0UL, 536846336UL, 7
 // "long" "double" IDENT DOT STAR RCURLY COMMA LPAREN RPAREN "this" "super" 
 // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN 
 // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION 
-// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL 
+// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL 
 // SR BSR PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" 
 // NUM_INT CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_63(_tokenSet_63_data_,12);
@@ -6518,7 +6518,7 @@ const unsigned long JavaRecognizer::_tokenSet_64_data_[] = { 0UL, 4294943616UL,
 // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" 
 // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6533,7 +6533,7 @@ const unsigned long JavaRecognizer::_tokenSet_66_data_[] = { 0UL, 402759680UL, 6
 // SEMI LBRACK RBRACK DOT STAR LCURLY RCURLY COMMA RPAREN ASSIGN COLON 
 // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR 
+// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR 
 // PLUS MINUS DIV MOD INC DEC 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_66(_tokenSet_66_data_,12);
 
diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp
index e83cd90e..1bdb9522 100644
--- a/languages/java/JavaStoreWalker.cpp
+++ b/languages/java/JavaStoreWalker.cpp
@@ -2447,11 +2447,11 @@ void JavaStoreWalker::expr(RefJavaAST _t) {
 			_t = _t->getNextSibling();
 			break;
 		}
-		case ETQUAL:
+		case EQUAL:
 		{
 			RefJavaAST __t145 = _t;
 			RefJavaAST tmp104_AST_in = _t;
-			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
+			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
 			_t = _t->getFirstChild();
 			expr(_t);
 			_t = _retTree;
@@ -2830,7 +2830,7 @@ void JavaStoreWalker::primaryExpression(RefJavaAST _t) {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case ETQUAL:
+			case EQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -3389,7 +3389,7 @@ const char* JavaStoreWalker::tokenNames[] = {
 	"BXOR",
 	"BAND",
 	"NOT_EQUAL",
-	"ETQUAL",
+	"EQUAL",
 	"LT_",
 	"GT",
 	"LE",
diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.hpp
index 6f20deaf..44322944 100644
--- a/languages/java/JavaStoreWalkerTokenTypes.hpp
+++ b/languages/java/JavaStoreWalkerTokenTypes.hpp
@@ -125,7 +125,7 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes {
 		BXOR = 114,
 		BAND = 115,
 		NOT_EQUAL = 116,
-		ETQUAL = 117,
+		EQUAL = 117,
 		LT_ = 118,
 		GT = 119,
 		LE = 120,
diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.hpp
index 64a6486b..e36fa54c 100644
--- a/languages/java/JavaTokenTypes.hpp
+++ b/languages/java/JavaTokenTypes.hpp
@@ -125,7 +125,7 @@ struct CUSTOM_API JavaTokenTypes {
 		BXOR = 114,
 		BAND = 115,
 		NOT_EQUAL = 116,
-		ETQUAL = 117,
+		EQUAL = 117,
 		LT_ = 118,
 		GT = 119,
 		LE = 120,
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 14471290..b1f23ac3 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -267,7 +267,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
     m_unitDict.insert( fileName, unit );
 
     if( m_fileList->contains(fileName) ){
-        kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl;
+        kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl;
     } else {
         KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) );
     }
diff --git a/languages/pascal/PascalLexer.cpp b/languages/pascal/PascalLexer.cpp
index 29475545..28f532f8 100644
--- a/languages/pascal/PascalLexer.cpp
+++ b/languages/pascal/PascalLexer.cpp
@@ -172,7 +172,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken PascalLexer::nextToken()
 			}
 			case 0x3d /* '=' */ :
 			{
-				mETQUAL(true);
+				mEQUAL(true);
 				theRetToken=_returnToken;
 				break;
 			}
@@ -508,9 +508,9 @@ void PascalLexer::mCOLON(bool _createToken) {
 	_saveIndex=0;
 }
 
-void PascalLexer::mETQUAL(bool _createToken) {
+void PascalLexer::mEQUAL(bool _createToken) {
 	int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length();
-	_ttype = ETQUAL;
+	_ttype = EQUAL;
 	ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex;
 	
 	match('=' /* charlit */ );
diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.hpp
index c2232e65..99a14959 100644
--- a/languages/pascal/PascalLexer.hpp
+++ b/languages/pascal/PascalLexer.hpp
@@ -77,7 +77,7 @@ public:
 	public: void mCOMMA(bool _createToken);
 	public: void mSEMI(bool _createToken);
 	public: void mCOLON(bool _createToken);
-	public: void mETQUAL(bool _createToken);
+	public: void mEQUAL(bool _createToken);
 	public: void mNOT_EQUAL(bool _createToken);
 	public: void mLTH(bool _createToken);
 	public: void mLE(bool _createToken);
diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp
index 80655b41..51d620ff 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) == ETQUAL)) {
+			if ((LA(1) == IDENT) && (LA(2) == EQUAL)) {
 				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(ETQUAL);
+		match(EQUAL);
 		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(ETQUAL);
+		match(EQUAL);
 		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(ETQUAL);
+		match(EQUAL);
 		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(ETQUAL);
+		match(EQUAL);
 		type();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -3234,7 +3234,7 @@ void PascalParser::expression() {
 		}
 		{
 		switch ( LA(1)) {
-		case ETQUAL:
+		case EQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -3783,7 +3783,7 @@ void PascalParser::subrangeTypeOrTypeIdentifier() {
 		}
 		case SEMI:
 		case RPAREN:
-		case ETQUAL:
+		case EQUAL:
 		case RBRACK:
 		{
 			break;
@@ -3891,7 +3891,7 @@ void PascalParser::stringType() {
 		}
 		case SEMI:
 		case RPAREN:
-		case ETQUAL:
+		case EQUAL:
 		case RBRACK:
 		{
 			break;
@@ -5033,7 +5033,7 @@ void PascalParser::proceduralTypePart1() {
 		}
 		case SEMI:
 		case RPAREN:
-		case ETQUAL:
+		case EQUAL:
 		case RBRACK:
 		{
 			break;
@@ -6535,9 +6535,9 @@ void PascalParser::expressionSign() {
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
-		case ETQUAL:
+		case EQUAL:
 		{
-			match(ETQUAL);
+			match(EQUAL);
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
@@ -8571,7 +8571,7 @@ void PascalParser::operatorDefinition() {
 			}
 			break;
 		}
-		case ETQUAL:
+		case EQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -8707,9 +8707,9 @@ void PascalParser::comparisonOperatorDefinition() {
 	try {      // for error handling
 		{
 		switch ( LA(1)) {
-		case ETQUAL:
+		case EQUAL:
 		{
-			match(ETQUAL);
+			match(EQUAL);
 			break;
 		}
 		case LE:
@@ -9283,7 +9283,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"label\"",
 	"\"const\"",
 	"\"resourcestring\"",
-	"ETQUAL",
+	"EQUAL",
 	"\"type\"",
 	"\"var\"",
 	"COLON",
@@ -9417,7 +9417,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"self\"",
 	"METHOD",
 	"ADDSUBOR",
-	"ASSIGNETQUAL",
+	"ASSIGNEQUAL",
 	"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" 
-// ETQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK 
+// EQUAL 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" ETQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" EQUAL "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 ETQUAL RBRACK 
+// SEMI RPAREN EQUAL 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" 
-// ETQUAL "type" "var" "procedure" "forward" "function" "of" "external" 
+// EQUAL "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 ETQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// SEMI LPAREN EQUAL 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 ETQUAL COLON "procedure" "function" DOTDOT 
+// EOF SEMI "end" COMMA RPAREN EQUAL 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 ETQUAL RBRACK 
+// SEMI COMMA RPAREN EQUAL 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 ETQUAL "procedure" "function" RBRACK 
+// SEMI "end" "index" LPAREN RPAREN EQUAL "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" ETQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" EQUAL "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 ETQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// LPAREN EQUAL 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" ETQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "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" ETQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "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" ETQUAL "of" DOTDOT 
+// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" EQUAL "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" ETQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "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" ETQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" EQUAL "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" ETQUAL COLON "procedure" 
+// EOF DOT SEMI "end" COMMA RPAREN "finalization" EQUAL 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 
diff --git a/languages/pascal/PascalStoreWalker.cpp b/languages/pascal/PascalStoreWalker.cpp
index 0a72ccfc..96c69fe4 100644
--- a/languages/pascal/PascalStoreWalker.cpp
+++ b/languages/pascal/PascalStoreWalker.cpp
@@ -252,7 +252,7 @@ void PascalStoreWalker::constantDefinitionPart(RefPascalAST _t) {
 		for (;;) {
 			if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) )
 				_t = ASTNULL;
-			if ((_t->getType() == ETQUAL)) {
+			if ((_t->getType() == EQUAL)) {
 				constantDefinition(_t);
 				_t = _retTree;
 			}
@@ -421,7 +421,7 @@ void PascalStoreWalker::constantDefinition(RefPascalAST _t) {
 	try {      // for error handling
 		RefPascalAST __t21 = _t;
 		RefPascalAST tmp15_AST_in = _t;
-		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
+		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
 		_t = _t->getFirstChild();
 		RefPascalAST tmp16_AST_in = _t;
 		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),IDENT);
@@ -2129,11 +2129,11 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 		if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) )
 			_t = ASTNULL;
 		switch ( _t->getType()) {
-		case ETQUAL:
+		case EQUAL:
 		{
 			RefPascalAST __t132 = _t;
 			RefPascalAST tmp85_AST_in = _t;
-			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
+			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
 			_t = _t->getFirstChild();
 			expression(_t);
 			_t = _retTree;
@@ -2241,7 +2241,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 			switch ( _t->getType()) {
 			case FUNC_CALL:
 			case DOT:
-			case ETQUAL:
+			case EQUAL:
 			case NUM_INT:
 			case LBRACK:
 			case SET:
@@ -2301,7 +2301,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 			switch ( _t->getType()) {
 			case FUNC_CALL:
 			case DOT:
-			case ETQUAL:
+			case EQUAL:
 			case NUM_INT:
 			case LBRACK:
 			case SET:
@@ -2691,7 +2691,7 @@ void PascalStoreWalker::element(RefPascalAST _t) {
 		}
 		case FUNC_CALL:
 		case DOT:
-		case ETQUAL:
+		case EQUAL:
 		case NUM_INT:
 		case LBRACK:
 		case SET:
@@ -3228,7 +3228,7 @@ const char* PascalStoreWalker::tokenNames[] = {
 	"\"label\"",
 	"\"const\"",
 	"\"resourcestring\"",
-	"ETQUAL",
+	"EQUAL",
 	"\"type\"",
 	"\"var\"",
 	"COLON",
@@ -3362,7 +3362,7 @@ const char* PascalStoreWalker::tokenNames[] = {
 	"\"self\"",
 	"METHOD",
 	"ADDSUBOR",
-	"ASSIGNETQUAL",
+	"ASSIGNEQUAL",
 	"SIGN",
 	"FUNC",
 	"NODE_NOT_EMIT",
@@ -3389,12 +3389,12 @@ const unsigned long PascalStoreWalker::_tokenSet_2_data_[] = { 0UL, 0UL, 8UL, 50
 // NUM_INT PLUS MINUS STRING_LITERAL "chr" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_2(_tokenSet_2_data_,12);
 const unsigned long PascalStoreWalker::_tokenSet_3_data_[] = { 4194432UL, 2048UL, 1107296264UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// FUNC_CALL DOT ETQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL 
+// FUNC_CALL DOT EQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL 
 // "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT LBRACK2 STRING_LITERAL 
 // "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_3(_tokenSet_3_data_,12);
 const unsigned long PascalStoreWalker::_tokenSet_4_data_[] = { 4194432UL, 2048UL, 1107427336UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// FUNC_CALL DOT ETQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT 
+// FUNC_CALL DOT EQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT 
 // NOT_EQUAL "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT 
 // LBRACK2 STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_4(_tokenSet_4_data_,12);
diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.hpp
index f86b1d42..cd9e0c81 100644
--- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp
+++ b/languages/pascal/PascalStoreWalkerTokenTypes.hpp
@@ -51,7 +51,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 		LABEL = 40,
 		CONST = 41,
 		RESOURCESTRING = 42,
-		ETQUAL = 43,
+		EQUAL = 43,
 		TYPE = 44,
 		VAR = 45,
 		COLON = 46,
@@ -185,7 +185,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 		SELF = 174,
 		TQT_METHOD = 175,
 		ADDSUBOR = 176,
-		ASSIGNETQUAL = 177,
+		ASSIGNEQUAL = 177,
 		SIGN = 178,
 		FUNC = 179,
 		NODE_NOT_EMIT = 180,
diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.hpp
index 3bc8950e..007269b0 100644
--- a/languages/pascal/PascalTokenTypes.hpp
+++ b/languages/pascal/PascalTokenTypes.hpp
@@ -54,7 +54,7 @@ struct CUSTOM_API PascalTokenTypes {
 		LABEL = 40,
 		CONST = 41,
 		RESOURCESTRING = 42,
-		ETQUAL = 43,
+		EQUAL = 43,
 		TYPE = 44,
 		VAR = 45,
 		COLON = 46,
@@ -188,7 +188,7 @@ struct CUSTOM_API PascalTokenTypes {
 		SELF = 174,
 		TQT_METHOD = 175,
 		ADDSUBOR = 176,
-		ASSIGNETQUAL = 177,
+		ASSIGNEQUAL = 177,
 		SIGN = 178,
 		FUNC = 179,
 		NODE_NOT_EMIT = 180,
diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h
index 5db231fd..becf2e77 100644
--- a/lib/cppparser/ast.h
+++ b/lib/cppparser/ast.h
@@ -183,7 +183,7 @@ enum NodeType
 TQString nodeTypeToString( int type );
 
 
-#if defined(CPPPARSER_TQUICK_ALLOCATOR)
+#if defined(CPPPARSER_QUICK_ALLOCATOR)
 
 #include <tquick_allocator.h>
 
diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h
index 78280c6c..4b8807a4 100644
--- a/lib/interfaces/extensions/kdevquickopen.h
+++ b/lib/interfaces/extensions/kdevquickopen.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVTQUICKOPEN_H
-#define KDEVTQUICKOPEN_H
+#ifndef KDEVQUICKOPEN_H
+#define KDEVQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
@@ -81,8 +81,8 @@ public:
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVTQUICKOPEN_H
-#define KDEVTQUICKOPEN_H
+#ifndef KDEVQUICKOPEN_H
+#define KDEVQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 114b98ac..0cb27812 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -85,8 +85,8 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
 	//@todo: other translations!
 	
 	// we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
     static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
 	static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
     kdDebug(9004) << "Directory filter line " << line << endl;
@@ -157,8 +157,8 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
 	static const TQString po_l("Opuszczam katalog");
 	
     // we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
 
 	static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
 
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index 8af36c67..304a78ae 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __KDEVPART_TQUICKOPEN_H__
-#define __KDEVPART_TQUICKOPEN_H__
+#ifndef __KDEVPART_QUICKOPEN_H__
+#define __KDEVPART_QUICKOPEN_H__
 
 #include <tqguardedptr.h>
 #include <kdevquickopen.h>
diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h
index 4697a327..e29d0b67 100644
--- a/parts/quickopen/quickopenclassdialog.h
+++ b/parts/quickopen/quickopenclassdialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef TQUICKOPENCLASSDIALOG_H
-#define TQUICKOPENCLASSDIALOG_H
+#ifndef QUICKOPENCLASSDIALOG_H
+#define QUICKOPENCLASSDIALOG_H
 
 #include "quickopendialog.h"
 #include <codemodel.h>
diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h
index 4ce1be3b..a5bd4e50 100644
--- a/parts/quickopen/quickopendialog.h
+++ b/parts/quickopen/quickopendialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef TQUICKOPENDIALOG_H
-#define TQUICKOPENDIALOG_H
+#ifndef QUICKOPENDIALOG_H
+#define QUICKOPENDIALOG_H
 
 #include <tqstringlist.h>
 #include <tqtimer.h>
diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h
index 7ed9b201..9bda6e43 100644
--- a/parts/quickopen/quickopenfiledialog.h
+++ b/parts/quickopen/quickopenfiledialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef TQUICKOPENFILEDIALOG_H
-#define TQUICKOPENFILEDIALOG_H
+#ifndef QUICKOPENFILEDIALOG_H
+#define QUICKOPENFILEDIALOG_H
 
 #include "quickopendialog.h"
 #include <tqstringlist.h>
diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h
index af71cc33..06f58e47 100644
--- a/parts/quickopen/quickopenfunctionchooseform.h
+++ b/parts/quickopen/quickopenfunctionchooseform.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef TQUICKOPENFUNCTIONCHOOSEFORM_H
-#define TQUICKOPENFUNCTIONCHOOSEFORM_H
+#ifndef QUICKOPENFUNCTIONCHOOSEFORM_H
+#define QUICKOPENFUNCTIONCHOOSEFORM_H
 
 #include "quickopenfunctionchooseformbase.h"
 
diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h
index e743f0fd..bd8805f5 100644
--- a/parts/quickopen/quickopenfunctiondialog.h
+++ b/parts/quickopen/quickopenfunctiondialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef TQUICKOPENFUNCTIONDLG_H
-#define TQUICKOPENFUNCTIONDLG_H
+#ifndef QUICKOPENFUNCTIONDLG_H
+#define QUICKOPENFUNCTIONDLG_H
 
 #include <codemodel.h>