1 files changed, 10 insertions, 10 deletions

diff --git a/experimental/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp b/experimental/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
index 3d3f18555..de638f732 100644
--- a/experimental/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
+++ b/experimental/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
@@ -185,7 +185,7 @@ static int getToken()
 		break;
 	    case 'f':
 		/*
-		  TQTranslator::tqfindMessage() has the same parameters as
+		  TQTranslator::findMessage() has the same parameters as
 		  TQApplication::translate().
 		*/
 		if ( strcmp(yyIdent + 1, "indMessage") == 0 )
@@ -228,7 +228,7 @@ static int getToken()
 			      delta;
 			  }
 
-		  The code tqcontains, indeed, two opening braces for
+		  The code contains, indeed, two opening braces for
 		  one closing brace; yet there's no reason to panic.
 
 		  The solution is to remember yyBraceDepth as it was
@@ -424,8 +424,8 @@ static int getToken()
 
 /*
   The second part of this source file is the parser. It accomplishes
-  a very easy task: It tqfinds all strings inside a tr() or translate()
-  call, and possibly tqfinds out the context of the call. It supports
+  a very easy task: It finds all strings inside a tr() or translate()
+  call, and possibly finds out the context of the call. It supports
   three cases: (1) the context is specified, as in
   FunnyDialog::tr("Hello") or translate("FunnyDialog", "Hello");
   (2) the call appears within an inlined function; (3) the call
@@ -545,12 +545,12 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		    }
 		    prefix = (const char *) 0;
 
-		    if ( qualifiedContexts.tqcontains(context) )
+		    if ( qualifiedContexts.contains(context) )
 			context = qualifiedContexts[context];
 		    tor->insert( MetaTranslatorMessage(context, text, com,
 						       TQString(), utf8) );
 
-		    if ( lacks_TQ_OBJECT.tqcontains(context) ) {
+		    if ( lacks_TQ_OBJECT.contains(context) ) {
 			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) context );
@@ -597,7 +597,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 	    com = com.simplifyWhiteSpace();
 	    if ( com.left(sizeof(MagicComment) - 1) == MagicComment ) {
 		com.remove( 0, sizeof(MagicComment) - 1 );
-		int k = com.tqfind( ' ' );
+		int k = com.find( ' ' );
 		if ( k == -1 ) {
 		    context = com;
 		} else {
@@ -612,7 +612,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		  namespace". See the manual for details.
 		*/
 		k = 0;
-		while ( (k = context.tqfind("::", k)) != -1 ) {
+		while ( (k = context.find("::", k)) != -1 ) {
 		    qualifiedContexts.insert( context.mid(k + 2), context );
 		    k++;
 		}
@@ -638,7 +638,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		namespaces.remove( namespaces.fromLast() );
 	    if ( yyBraceDepth == (int) namespaces.count() ) {
 		if ( missing_TQ_OBJECT ) {
-		    if ( needs_TQ_OBJECT.tqcontains(functionContext) ) {
+		    if ( needs_TQ_OBJECT.contains(functionContext) ) {
 			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) functionContext );
@@ -748,7 +748,7 @@ bool UiHandler::endElement( const TQString& /* namespaceURI */,
 			    const TQString& /* localName */,
 			    const TQString& qName )
 {
-    accum.tqreplace( TQRegExp(TQString("\r\n")), "\n" );
+    accum.replace( TQRegExp(TQString("\r\n")), "\n" );
 
     if ( qName == TQString("class") ) {
 	if ( context.isEmpty() )