rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knights@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

23 files changed, 178 insertions, 178 deletions

diff --git a/knights/audio.cpp b/knights/audio.cpp
index 590a1e8..ec3825b 100644
--- a/knights/audio.cpp
+++ b/knights/audio.cpp
@@ -67,7 +67,7 @@ void audio::play( const int snd )
 	if( a->firstTime || !enabled || !a->enabled )
 		return;
 
-	TQMap<int, Arts::PlayObject>::Iterator IT = a->audioMap.tqfind( snd );
+	TQMap<int, Arts::PlayObject>::Iterator IT = a->audioMap.find( snd );
 
 	if( IT == a->audioMap.end() )
 	{
diff --git a/knights/board_2d.cpp b/knights/board_2d.cpp
index 27d9aed..c7c627c 100644
--- a/knights/board_2d.cpp
+++ b/knights/board_2d.cpp
@@ -180,7 +180,7 @@ void board_2d::drawMove( const ChessMove &chessMove, const bool &reverse )
 	/* Draw the originating position */
 	drawPosition( fromPtr );
 
-	if( TQString( chessMove.SAN ).tqcontains( "o-o", FALSE ) )
+	if( TQString( chessMove.SAN ).contains( "o-o", FALSE ) )
 	{
 		/* This is a castle */
 		ChessMove newMove;
@@ -188,7 +188,7 @@ void board_2d::drawMove( const ChessMove &chessMove, const bool &reverse )
 		newMove.fromRank = chessMove.fromRank;
 		newMove.toRank = chessMove.toRank;
 		newMove.ManTaken = Null;
-		if( TQString( chessMove.SAN ).tqcontains( "o-o-o", FALSE ) )
+		if( TQString( chessMove.SAN ).contains( "o-o-o", FALSE ) )
 		{
 			/* Queenside */
 			newMove.fromFile = 0;
@@ -383,7 +383,7 @@ void board_2d::drawPosition( const int &pos )
 	}
 	else
 		cacheName += " ";
-	if( cache->tqfind( cacheName, buffer ) )
+	if( cache->find( cacheName, buffer ) )
 	{
 		/*
 				Cache Hit... no need to redraw
diff --git a/knights/challenge_graph.cpp b/knights/challenge_graph.cpp
index 106b4ee..e9ff3d2 100644
--- a/knights/challenge_graph.cpp
+++ b/knights/challenge_graph.cpp
@@ -417,7 +417,7 @@ void Challenge_Graph::display_menuSeek( Challenge_Game *Item, const TQPoint &Pos
 	bool enable;
 	if( Item != NULL )
 	{
-		selectedPlayerName = Item->_player.tqreplace( TQRegExp("\\(.+\\)"), TQString("") );
+		selectedPlayerName = Item->_player.replace( TQRegExp("\\(.+\\)"), TQString("") );
 		selectedMatchID = Item->id();
 		enable = TRUE;
 	}
diff --git a/knights/console.cpp b/knights/console.cpp
index 53048fb..bfa9932 100644
--- a/knights/console.cpp
+++ b/knights/console.cpp
@@ -253,12 +253,12 @@ TQString Console::insertTags(TQString data)
 	pos = hyperLinks.search(data, 0);
 	if(pos >= 0)
 	{
-		data.tqreplace(hyperLinks, "<A HREF=\"" + hyperLinks.cap(0) + "\">" + hyperLinks.cap(0) + "</A>");
+		data.replace(hyperLinks, "<A HREF=\"" + hyperLinks.cap(0) + "\">" + hyperLinks.cap(0) + "</A>");
 	}
 	pos = mailLinks.search(data, 0);
 	if(pos >= 0)
 	{
-		data.tqreplace(mailLinks, "<A HREF=\"mailto:" + mailLinks.cap(0) + "\">" + mailLinks.cap(0) + "</A>");
+		data.replace(mailLinks, "<A HREF=\"mailto:" + mailLinks.cap(0) + "\">" + mailLinks.cap(0) + "</A>");
 	}
 	return data;
 }
diff --git a/knights/core.cpp b/knights/core.cpp
index 69e59fd..0caf844 100644
--- a/knights/core.cpp
+++ b/knights/core.cpp
@@ -90,7 +90,7 @@ void core::createNewIO( int type, int ID, int side, int str )
         else
         {
           /* Use an existing internetIO */
-          internetioPtr = (io_internet*) myIOMap.tqfind(Null);
+          internetioPtr = (io_internet*) myIOMap.find(Null);
           if( internetioPtr == NULL )
           {
             kdWarning() << "core::createNewIO: Trying to connect a match to an internetIO that doesn't exsist." << endl;
@@ -114,12 +114,12 @@ void core::createNewIO( int type, int ID, int side, int str )
         }
         else
         {
-          internetioPtr = (io_internet*)  myIOMap.tqfind(ID);
+          internetioPtr = (io_internet*)  myIOMap.find(ID);
           if( internetioPtr == NULL )
           {
             /* no io mapped to the ID yet, use the internetio */
             /* Use an existing internetIO */
-            internetioPtr = (io_internet*) myIOMap.tqfind(Null);
+            internetioPtr = (io_internet*) myIOMap.find(Null);
             if( internetioPtr == NULL )
             {
               kdWarning() << "core::createNewIO: Trying to connect a match to an internetIO that doesn't exsist." << endl;
@@ -214,7 +214,7 @@ void core::setMatch( int ID )
 	/*
 			Now display the new match, and connect it's signals to the GUI
 	*/
-	currentMatch = myMatchMap.tqfind( ID );
+	currentMatch = myMatchMap.find( ID );
 	currentMatch->setVisibility( TRUE );
 	myButtonGroup->setButton( ID );
 	connect( currentMatch, TQT_SIGNAL( setClocks() ), this, TQT_SLOT( slot_setClocks() ) );
@@ -264,7 +264,7 @@ bool core::clearMatch( int id )
 			return FALSE;
 		}
 	}
-	departingMatch = myMatchMap.tqfind(id);
+	departingMatch = myMatchMap.find(id);
 
 	/* A bad ID was passed */
 	if( departingMatch == NULL )
@@ -305,7 +305,7 @@ bool core::clearMatch( int id )
 	}
 
 	/* Remove IOs in this match... */
-	ioPtr = myIOMap.tqfind(id);
+	ioPtr = myIOMap.find(id);
 	while( ioPtr != NULL )
 	{
 		myIOMap.remove( id );
@@ -313,7 +313,7 @@ bool core::clearMatch( int id )
 		{
 			delete ioPtr;
 		}
-		ioPtr = myIOMap.tqfind(id);
+		ioPtr = myIOMap.find(id);
 	}
 
 	/* ...and remove the match */
@@ -357,7 +357,7 @@ void core::command2IO( const Command &command )
   io_base *io;
   int id = ((Command)command).getID();
 
-  io = myIOMap.tqfind(id);
+  io = myIOMap.find(id);
   while( io != NULL )
   {
     io->recvCMD(command);
@@ -375,7 +375,7 @@ void core::command2Match( const Command &command )
 	match *matchPtr;
 	Command cmd = command;
 
-	matchPtr = myMatchMap.tqfind( cmd.getID() );
+	matchPtr = myMatchMap.find( cmd.getID() );
   while( matchPtr != NULL )
 	{
 		/* Catch Commands Meant for Core */
@@ -503,7 +503,7 @@ TQString core::caption( void )
 {
 	TQButton *Button;
 	if( currentMatch == NULL ) return TQString();
-	Button = myButtonGroup->tqfind( currentMatch->getID() );
+	Button = myButtonGroup->find( currentMatch->getID() );
 	if( Button != NULL ) Button->setText( currentMatch->caption() );
 	return currentMatch->caption();
 }
@@ -599,7 +599,7 @@ void core::print( int ID )
 	}
 	else
 	{
-		m2p = myMatchMap.tqfind( ID );
+		m2p = myMatchMap.find( ID );
 	}
 	if( m2p == NULL ) return;
 	m2p->print();
@@ -650,7 +650,7 @@ bool core::save( const int ID, const bool Prompt, const bool SaveAs )
 	}
 	else
 	{
-		match2bSaved = myMatchMap.tqfind( ID );
+		match2bSaved = myMatchMap.find( ID );
 	}
 	if( match2bSaved == NULL ) return FALSE;
 	if( Prompt )
@@ -683,7 +683,7 @@ bool core::save( const int ID, const bool Prompt, const bool SaveAs )
 		{
 			return FALSE;
 		}
-		if( URL.tqfindRev( ".pgn", -1, FALSE ) == -1 )
+		if( URL.findRev( ".pgn", -1, FALSE ) == -1 )
 		{
 			URL += ".pgn";
 		}
diff --git a/knights/dlg_challenge.cpp b/knights/dlg_challenge.cpp
index b5ac2ec..342be76 100644
--- a/knights/dlg_challenge.cpp
+++ b/knights/dlg_challenge.cpp
@@ -89,11 +89,11 @@ void dlg_challenge::setValues( const TQString &string, const TQString &local )
 	TQStringList list;
 
 	/*remove all the white space between the rating brackets*/
-	myString.tqreplace( TQRegExp("\\(\\s"), "(" );
-	myString.tqreplace( TQRegExp("\\s\\)"), ")" );
+	myString.replace( TQRegExp("\\(\\s"), "(" );
+	myString.replace( TQRegExp("\\s\\)"), ")" );
 	
 	list = TQStringList::split( TQChar(' '), myString, FALSE );
-	list[7].tqreplace(TQRegExp("\\."), "");
+	list[7].replace(TQRegExp("\\."), "");
 	if( list[0] == local )
 	{
 		localRating = list[1];
diff --git a/knights/dlg_engine.cpp b/knights/dlg_engine.cpp
index ebef625..b99e21d 100644
--- a/knights/dlg_engine.cpp
+++ b/knights/dlg_engine.cpp
@@ -191,7 +191,7 @@ void dlg_engine::slotFilenameDialog( void )
 	EDIT_Filename->setText( temp );
 	if( EDIT_Name->text().isEmpty() )
 	{
-		tmp = temp.tqfindRev( '/' );
+		tmp = temp.findRev( '/' );
 		EDIT_Name->setText( temp.remove( 0, tmp + 1 ) );
 	}
 	enableButtonApply( TRUE );
diff --git a/knights/io_engine.cpp b/knights/io_engine.cpp
index 5f44b1e..ee44a96 100644
--- a/knights/io_engine.cpp
+++ b/knights/io_engine.cpp
@@ -231,9 +231,9 @@ void io_engine::Recv( KProcess*, char *buffer, int bufLen )
 	FIFO_In += newBuff;
 	delete newBuff;
 
-	if( FIFO_In.tqcontains( TQChar('\n') ) )
+	if( FIFO_In.contains( TQChar('\n') ) )
 	{
-		TQString proc = FIFO_In.left( FIFO_In.tqfindRev( TQChar('\n') ) );
+		TQString proc = FIFO_In.left( FIFO_In.findRev( TQChar('\n') ) );
 		FIFO_In = FIFO_In.right( FIFO_In.length() - proc.length() );
 
 		/* Split and Parse Full Lines of Input */
diff --git a/knights/io_internet.cpp b/knights/io_internet.cpp
index b51dfb2..2c11193 100644
--- a/knights/io_internet.cpp
+++ b/knights/io_internet.cpp
@@ -311,7 +311,7 @@ void io_internet::recvCMD(const Command& command)
       sendCMD( command );
       break;
     case CMD_Send_To_ICS:
-			if(((Command)command).getData().tqcontains(TQRegExp("^(?:\\.|tell)")))
+			if(((Command)command).getData().contains(TQRegExp("^(?:\\.|tell)")))
 			{
 				writeToConsole(((Command)command).getData(), "K_PVT");
       }
@@ -419,7 +419,7 @@ void io_internet::readCommand(KSocket* socket)
     {
       if(lineBuffer == "" || i != --lines.end())
       {
-        (*i).tqreplace( TQRegExp( "\\a" ), "" );
+        (*i).replace( TQRegExp( "\\a" ), "" );
         parseLine(*i);
       }
     }
@@ -456,7 +456,7 @@ void io_internet::parseLoginData( TQString data )
 
   if(loginStage == LOGIN_STAGE_NAME)
   {
-    if(data.tqcontains( "login:" ))
+    if(data.contains( "login:" ))
     {
 			sendUserName();
     }
@@ -468,9 +468,9 @@ void io_internet::parseLoginData( TQString data )
   }
   else if(loginStage == LOGIN_STAGE_PASSWORD)
   {
-    if(data.tqcontains("**** Invalid password! ****") ||
-       data.tqcontains("Sorry, names can only consist of lower and upper case letters.  Try again.") ||
-			 data.tqcontains("If you are not a registered player, enter guest or a unique ID."))
+    if(data.contains("**** Invalid password! ****") ||
+       data.contains("Sorry, names can only consist of lower and upper case letters.  Try again.") ||
+			 data.contains("If you are not a registered player, enter guest or a unique ID."))
     {
       loginDlg = new dlg_login( myParent, "LoginDialog", myResource);
 			loginDlg->disableServerSelect();
@@ -478,7 +478,7 @@ void io_internet::parseLoginData( TQString data )
 		  connect(loginDlg, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( selfDestruct() ) );
 			connect(loginDlg, TQT_SIGNAL( login(TQString, TQString) ), this, TQT_SLOT( setUserInfo(TQString, TQString) ) );
     }
-    else if(data.tqcontains("Press return to enter the server as"))
+    else if(data.contains("Press return to enter the server as"))
     {
       TQRegExp guestName("Logging you in as \"(\\w*)\"");
       int pos = guestName.search(data);
@@ -488,7 +488,7 @@ void io_internet::parseLoginData( TQString data )
       }
       send("\n");
     }
-    else if(data.tqcontains("password:"))
+    else if(data.contains("password:"))
     {
       sendPassword();
     }
@@ -526,13 +526,13 @@ void io_internet::parseLine( TQString line )
   switch(parseMode)
   {
     case NORMAL_MODE: /* determine which mode we should go into */
-      if(line.tqcontains(TQRegExp("^\\s*\\d{1,3}\\s+(?:\\d{1,4}|\\+\\+\\+\\+|\\-\\-\\-\\-)\\s+\\w{3,17}(\\(C\\))?\\s+\\d{1,3}\\s+\\d{1,3}")))
+      if(line.contains(TQRegExp("^\\s*\\d{1,3}\\s+(?:\\d{1,4}|\\+\\+\\+\\+|\\-\\-\\-\\-)\\s+\\w{3,17}(\\(C\\))?\\s+\\d{1,3}\\s+\\d{1,3}")))
       {
         updateSoughtList(line);
         parseMode = UPDATE_SOUGHT_MODE;
       }
       /* CHALLENGE */
-      else if( line.tqcontains(TQRegExp("^\\s*Challenge: ")))
+      else if( line.contains(TQRegExp("^\\s*Challenge: ")))
       {
         myResource->play( SND_CHALLENGE );
         if( challenge != NULL )
@@ -543,7 +543,7 @@ void io_internet::parseLine( TQString line )
         connect( challenge, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( nullifyChallenge() ) );
         connect( challenge, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( acceptChallenge() ) );
         connect( challenge, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( declineChallenge() ) );
-        line.tqreplace(TQRegExp("^\\s*Challenge: "), "");
+        line.replace(TQRegExp("^\\s*Challenge: "), "");
         challenge->setValues( line, userName );
         parseMode = CHALLENGE_MODE;
       }
@@ -555,12 +555,12 @@ void io_internet::parseLine( TQString line )
         }
       }
       /* SOUGHT GAME */
-      else if(line.tqcontains("seeking"))
+      else if(line.contains("seeking"))
       {
       //  writeToConsole("seeking", "K_CH");
       }
       /* PRIVATE TELL */
-      else if(line.tqcontains(TQRegExp(".+ tells you: .*")))
+      else if(line.contains(TQRegExp(".+ tells you: .*")))
       {
         /* First grab the user name so we can auto-respond later */
         emit sendCMD( Command( 0, CMD_Set_Src_Tell, line.section(' ', 0, 0) ) );
@@ -568,19 +568,19 @@ void io_internet::parseLine( TQString line )
         writeToConsole(line, "K_PVT");
       }
       /* SAY */
-      else if(line.tqcontains( TQRegExp(".+ says: .*")))
+      else if(line.contains( TQRegExp(".+ says: .*")))
       {
         myResource->play(SND_SAY);
         writeToConsole(line, "K_PVT");
         return;
       }
       /* WHISPER & KIBITZ */
-      else if(line.tqcontains(TQRegExp(".+ whispers: .*")) || line.tqcontains(TQRegExp(".+ kibitzes: .*")))
+      else if(line.contains(TQRegExp(".+ whispers: .*")) || line.contains(TQRegExp(".+ kibitzes: .*")))
       {
         writeToConsole(line, "K_WSP");
       }
       /* Important System Messages: Use Whisper Color */
-      else if(line.tqcontains(TQRegExp("declines the draw request\\.$" )))
+      else if(line.contains(TQRegExp("declines the draw request\\.$" )))
       {
         writeToConsole(line, "K_WSP");
       }
@@ -589,51 +589,51 @@ void io_internet::parseLine( TQString line )
       {
         writeToConsole(line, "K_WSP");
       }
-      else if( line.tqcontains( TQRegExp(".+rating adjustment:.+" ) ) )
+      else if( line.contains( TQRegExp(".+rating adjustment:.+" ) ) )
       {
         writeToConsole(line, "K_WSP");
       }
       /* SHOUTS */
-      else if( line.tqcontains( TQRegExp("^c?t?s?-?shouts: ") ) )
+      else if( line.contains( TQRegExp("^c?t?s?-?shouts: ") ) )
       {
         writeToConsole(line, "K_SHT");
       }
       /* NOTIFY */
-      else if((line.tqcontains(TQRegExp("\\s*Notification:"))) ||
-          (line.tqcontains(TQRegExp("\\s*Present company includes:"))) ||
-          (line.tqcontains(TQRegExp("\\s*Your arrival was noted by:"))))
+      else if((line.contains(TQRegExp("\\s*Notification:"))) ||
+          (line.contains(TQRegExp("\\s*Present company includes:"))) ||
+          (line.contains(TQRegExp("\\s*Your arrival was noted by:"))))
       {
         writeToConsole(line, "K_NOT");
         myResource->play( SND_NOTIFICATION );
       }
       /* CHANNEL TELLS */
-      else if(line.tqcontains(TQRegExp( ".\\(\\d+\\):" )))
+      else if(line.contains(TQRegExp( ".\\(\\d+\\):" )))
       {
         /* First grab the channel # so we can auto-respond later */
-        j = line.tqfind(TQString("):"));
-        i = line.tqfindRev(TQString("("), j) + 1;
+        j = line.find(TQString("):"));
+        i = line.findRev(TQString("("), j) + 1;
         emit sendCMD( Command( 0, CMD_Set_Src_Channel, line.mid(i, j - i) ) );
         writeToConsole(line, "K_CH");
       }
-      else if(line.tqcontains(TQRegExp("^<12>\\s")))
+      else if(line.contains(TQRegExp("^<12>\\s")))
       {
         /* a game move */
         parseStyle12(line, PARSE12_MODE_MOVE);
       }
-      else if(line.tqcontains(TQRegExp("^<b1>\\s")))
+      else if(line.contains(TQRegExp("^<b1>\\s")))
       {
         /* a bughouse piece has been passed or a piece has been captured in crazyhouse */
         writeToConsole(line, "K_CH");
       }
-      else if(line.tqcontains(TQRegExp("^\\\\")))
+      else if(line.contains(TQRegExp("^\\\\")))
       {
         writeToConsole(line, lastTag);
       }
-      else if(line.tqcontains(TQRegExp("^\\{?Game \\d+")) && line.tqcontains("Creating", TRUE))
+      else if(line.contains(TQRegExp("^\\{?Game \\d+")) && line.contains("Creating", TRUE))
       {
         parseMode = NEW_GAME_MODE;
       }
-      else if(line.tqcontains("You are now observing game"))
+      else if(line.contains("You are now observing game"))
       {
         parseMode = OBSERVE_GAME_MODE;
       }
@@ -647,21 +647,21 @@ void io_internet::parseLine( TQString line )
         }
         parseMode = PARSE_MOVE_LIST_MODE;
       }
-      else if((line.tqcontains(TQRegExp("^\\{?Game \\d+")) || line.tqcontains(TQRegExp("Game \\d+"))) &&
+      else if((line.contains(TQRegExp("^\\{?Game \\d+")) || line.contains(TQRegExp("Game \\d+"))) &&
                (
-                 line.tqcontains(" forfeits by disconnection", TRUE) ||
-                 line.tqcontains(" forfeits by disconnection}", TRUE) ||
-                 line.tqcontains(" forfeits on time} ", TRUE) ||
-                 line.tqcontains(" forfeits on time ", TRUE) ||
-                 line.tqcontains(" resigns} ", TRUE) ||
-                 line.tqcontains(" resigns ", TRUE) ||
-                 line.tqcontains(" Game drawn by mutual agreement ", TRUE) ||
-                 line.tqcontains(" Game drawn by mutual agreement} ", TRUE) ||
-                 line.tqcontains(", has lost contact or quit.", TRUE) ||
-                 line.tqcontains(" checkmated ", TRUE) ||
-                 line.tqcontains(" checkmated} ", TRUE) ||
-                 line.tqcontains("lost connection", TRUE) ||
-                 line.tqcontains("has no material to mate", TRUE)
+                 line.contains(" forfeits by disconnection", TRUE) ||
+                 line.contains(" forfeits by disconnection}", TRUE) ||
+                 line.contains(" forfeits on time} ", TRUE) ||
+                 line.contains(" forfeits on time ", TRUE) ||
+                 line.contains(" resigns} ", TRUE) ||
+                 line.contains(" resigns ", TRUE) ||
+                 line.contains(" Game drawn by mutual agreement ", TRUE) ||
+                 line.contains(" Game drawn by mutual agreement} ", TRUE) ||
+                 line.contains(", has lost contact or quit.", TRUE) ||
+                 line.contains(" checkmated ", TRUE) ||
+                 line.contains(" checkmated} ", TRUE) ||
+                 line.contains("lost connection", TRUE) ||
+                 line.contains("has no material to mate", TRUE)
                )
              )
       {
@@ -671,15 +671,15 @@ void io_internet::parseLine( TQString line )
       {
         /* don't know what to do with it, just send it to the console */
         /* don't write the prompt to the console */
-				if( line.tqcontains( TQRegExp( "^a?d?f?g?s?z?ics% " ) ) ||
-						line.tqcontains( TQRegExp( "^cex% " ) ) ||
-						line.tqcontains( TQRegExp( "^chess% " ) ) )
+				if( line.contains( TQRegExp( "^a?d?f?g?s?z?ics% " ) ) ||
+						line.contains( TQRegExp( "^cex% " ) ) ||
+						line.contains( TQRegExp( "^chess% " ) ) )
 						break;
         writeToConsole(line, "K_STD");
       }
       break;
     case UPDATE_SOUGHT_MODE:
-      if(line.tqcontains(TQRegExp("\\d+\\s+ads? displayed.")))
+      if(line.contains(TQRegExp("\\d+\\s+ads? displayed.")))
       {
         updateSoughtList(line);
         parseMode = NORMAL_MODE;
@@ -690,7 +690,7 @@ void io_internet::parseLine( TQString line )
       }
       break;
     case NEW_GAME_MODE:
-      if(line.tqcontains(TQRegExp("<12>\\s")))
+      if(line.contains(TQRegExp("<12>\\s")))
       {
         /* a game move */
         parseStyle12(line, PARSE12_MODE_NEW);
@@ -701,7 +701,7 @@ void io_internet::parseLine( TQString line )
       }
       break;
     case OBSERVE_GAME_MODE:
-      if(line.tqcontains(TQRegExp("<12>\\s")))
+      if(line.contains(TQRegExp("<12>\\s")))
       {
         /* a game move */
         parseStyle12(line, PARSE12_MODE_NEW);
@@ -716,9 +716,9 @@ void io_internet::parseLine( TQString line )
       }
       break;
     case PARSE_MOVE_LIST_MODE:
-      if(!line.tqcontains("{Still in progress}"))
+      if(!line.contains("{Still in progress}"))
       {
-        if(line.tqcontains(TQRegExp("\\d\\.")))
+        if(line.contains(TQRegExp("\\d\\.")))
         {
           parseMoveList(line);
         }
@@ -847,9 +847,9 @@ void io_internet::parseStyle12(TQString line, const unsigned int Mode)
       }
 
       /* Verbose Coordinate Notation of previous move ( USE AS CAN ) */
-      strcpy(move.CAN, fields[27].right(fields[27].length() - 2).tqreplace(TQRegExp("-"), ""));
+      strcpy(move.CAN, fields[27].right(fields[27].length() - 2).replace(TQRegExp("-"), ""));
       /* SAN  */
-      strcpy(move.SAN, fields[29].tqreplace(TQRegExp("\\+"), "").tqreplace(TQRegExp("#"), ""));
+      strcpy(move.SAN, fields[29].replace(TQRegExp("\\+"), "").replace(TQRegExp("#"), ""));
 
       /* fill the line for the command */
       position_line += fields[1];  /* Internal Rank #7 */
@@ -889,31 +889,31 @@ void io_internet::parseStyle12(TQString line, const unsigned int Mode)
 //{
 //	player.Raw = Handle;
 	/* SysAdmin */
-//	if( Handle.tqcontains( TQRegExp("\\(\\*\\)") ) )
+//	if( Handle.contains( TQRegExp("\\(\\*\\)") ) )
 //	{
 //		player.SysAdmin = TRUE;
-//		Handle.tqreplace( TQRegExp("\\(\\*\\)"), TQString("") );
+//		Handle.replace( TQRegExp("\\(\\*\\)"), TQString("") );
 //	}
 //	else player.SysAdmin = FALSE;
 	/* ServiceRep */
-//	if( Handle.tqcontains( TQRegExp("\\(SR\\)") ) )
+//	if( Handle.contains( TQRegExp("\\(SR\\)") ) )
 //	{
 //		player.ServiceRep = TRUE;
-//		Handle.tqreplace( TQRegExp("\\(SR\\)"), TQString("") );
+//		Handle.replace( TQRegExp("\\(SR\\)"), TQString("") );
 //	}
 //	else player.ServiceRep = FALSE;
 	/* Computer */
-//	if( Handle.tqcontains( TQRegExp("\\(C\\)") ) )
+//	if( Handle.contains( TQRegExp("\\(C\\)") ) )
 //	{
 //		player.Computer = TRUE;
-//		Handle.tqreplace( TQRegExp("\\(C\\)"), TQString("") );
+//		Handle.replace( TQRegExp("\\(C\\)"), TQString("") );
 //	}
 //	else player.Computer = FALSE;
 	/* Unregistered */
-//	if( Handle.tqcontains( TQRegExp("\\(U\\)") ) )
+//	if( Handle.contains( TQRegExp("\\(U\\)") ) )
 //	{
 //		player.Unregistered = TRUE;
-//		Handle.tqreplace( TQRegExp("\\(U\\)"), TQString("") );
+//		Handle.replace( TQRegExp("\\(U\\)"), TQString("") );
 //	}
 //	else player.Unregistered = FALSE;
 //	return;
@@ -960,13 +960,13 @@ void io_internet::writeToConsole(TQString text, TQString tag)
 {
   lastTag = tag;
   /* Remove Bells */
-  text.tqreplace( TQRegExp("\\x0007") , "" );
+  text.replace( TQRegExp("\\x0007") , "" );
   /* Replace misc characters with rich-text friendly counterparts */
-  text.tqreplace( TQRegExp("\\x003c"), "&#60;" );
-  text.tqreplace( TQRegExp("\\x007c"), "&#124;" );
-	text.tqreplace( TQRegExp( "\\f"), "");
-  text.tqreplace( TQRegExp( "\\n"), "");
-  text.tqreplace( TQRegExp( "\\r*" ), "" );
+  text.replace( TQRegExp("\\x003c"), "&#60;" );
+  text.replace( TQRegExp("\\x007c"), "&#124;" );
+	text.replace( TQRegExp( "\\f"), "");
+  text.replace( TQRegExp( "\\n"), "");
+  text.replace( TQRegExp( "\\r*" ), "" );
   emit sendCMD( Command( 0, CMD_Append_To_Console, "<" + tag + ">" + text + "</" + tag + ">" ) );
 }
 
@@ -978,7 +978,7 @@ void io_internet::writeToConsole(TQString text, TQString tag)
 void io_internet::updateSoughtList(TQString soughtLine)
 {
   /* "ADS DISPLAYED" MESSAGE */
-  if(soughtLine.tqcontains(TQRegExp("\\d+\\s+ads? displayed.")))
+  if(soughtLine.contains(TQRegExp("\\d+\\s+ads? displayed.")))
   {
 		emit sendCMD( Command( 0, CMD_Show_Sought_List ) );
   }
@@ -1064,11 +1064,11 @@ void io_internet::sendEndOfGameCommand(TQString line)
   fields[fields.count() - 1] = fields[fields.count() - 1].stripWhiteSpace();
   if(fields[fields.count() - 1] == "1-0" )
   {
-    if(fields[fields.count() - 2].tqcontains("resigns"))
+    if(fields[fields.count() - 2].contains("resigns"))
     {
       command.setCommand((int&)CMD_Black_Resign);
     }
-    else if(fields[fields.count() - 2].tqcontains("time"))
+    else if(fields[fields.count() - 2].contains("time"))
     {
       command.setCommand((int&)CMD_White_Called_Flag);
     }
@@ -1079,11 +1079,11 @@ void io_internet::sendEndOfGameCommand(TQString line)
   }
   else if(fields[fields.count() - 1] == "0-1")
   {
-    if(fields[fields.count() - 2].tqcontains("resigns"))
+    if(fields[fields.count() - 2].contains("resigns"))
     {
       command.setCommand((int&)CMD_White_Resign);
     }
-    else if(fields[fields.count() - 2].tqcontains("time"))
+    else if(fields[fields.count() - 2].contains("time"))
     {
       command.setCommand((int&)CMD_Black_Called_Flag);
     }
diff --git a/knights/knightsmap.h b/knights/knightsmap.h
index 0cfa7cb..21edeea 100644
--- a/knights/knightsmap.h
+++ b/knights/knightsmap.h
@@ -88,7 +88,7 @@ void						add( KeyType key, DataType data )
 
 								/*
 										Return the next Value associated with the Key given
-										in the last call to 'tqfind'. If there are none, then
+										in the last call to 'find'. If there are none, then
 										NULL is returned.
 								*/
 T&							findNext( void )
@@ -110,7 +110,7 @@ T&							findNext( void )
 										the first Value that's associated with the given Key.
 										If no Value has the given Key, NULL is returned.
 								*/
-T&							tqfind( KeyType key )
+T&							find( KeyType key )
 								{
 									searchKey = key;
 									searchIndex = 0;
diff --git a/knights/knightspixcache.cpp b/knights/knightspixcache.cpp
index 0f69099..989fcfb 100644
--- a/knights/knightspixcache.cpp
+++ b/knights/knightspixcache.cpp
@@ -106,10 +106,10 @@ void KnightsPixCache::add( const TQString &label, const TQPixmap &pixmap )
 }
 ///////////////////////////////////////
 //
-//	KnightsPixCache::tqfind
+//	KnightsPixCache::find
 //
 ///////////////////////////////////////
-bool KnightsPixCache::tqfind( const TQString &label, TQPixmap &pixmap )
+bool KnightsPixCache::find( const TQString &label, TQPixmap &pixmap )
 {
 	bool status(FALSE);
 	for( IT = list.begin(); IT != list.end(); ++IT )
diff --git a/knights/knightspixcache.h b/knights/knightspixcache.h
index 4cc5857..dedd438 100644
--- a/knights/knightspixcache.h
+++ b/knights/knightspixcache.h
@@ -87,7 +87,7 @@ class KnightsPixCache
 		void									setCacheLimit( const unsigned int &limit );
 		unsigned int					cacheLimit( void );
 		void									add( const TQString &label, const TQPixmap &pixmap );
-		bool									tqfind( const TQString &label, TQPixmap &pixmap);
+		bool									find( const TQString &label, TQPixmap &pixmap);
 		void									resize( const int &size );
 		
 		private:
diff --git a/knights/knightstextview.cpp b/knights/knightstextview.cpp
index 3e31725..7352206 100644
--- a/knights/knightstextview.cpp
+++ b/knights/knightstextview.cpp
@@ -46,7 +46,7 @@ KnightsTextView::KnightsTextView(TQWidget *tqparent, resource *Rsrc ) : TQTextBr
 	menuView->insertSeparator();
 	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("fileprint"), KIcon::Small ) ),
 												i18n( "&Print" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_P, MENU_PRINT );
-//  menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("tqfind"), KIcon::Small ) ),
+//  menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("find"), KIcon::Small ) ),
 //                        i18n( "&Find" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_F, MENU_FIND );
 //	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("next"), KIcon::Small ) ),
 //												i18n( "Find &Next" ), this, TQT_SLOT( menuFunct(int) ), Key_F3, MENU_FIND_NEXT );
diff --git a/knights/match.cpp b/knights/match.cpp
index 6ef115a..c22f88d 100644
--- a/knights/match.cpp
+++ b/knights/match.cpp
@@ -798,7 +798,7 @@ bool match::move( void )
 	}
 
 	/* Play sound for Promotion */
-	if( TQString( chessMove.SAN ).tqcontains( TQChar( '=' ) ) )
+	if( TQString( chessMove.SAN ).contains( TQChar( '=' ) ) )
 	{
 		soundType = SND_PROMOTE;
 	}
diff --git a/knights/pgn.cpp b/knights/pgn.cpp
index 3723f8a..a0b4674 100644
--- a/knights/pgn.cpp
+++ b/knights/pgn.cpp
@@ -172,14 +172,14 @@ TQStringList* pgn::notation( const int format )
 					notation += TQString( " $%1" ).tqarg( TQString::number( (*IT).NAG ) );
 				}
 				/* Insert RAVs */
-				annon = RAV.tqfind( tmp );
+				annon = RAV.find( tmp );
 				if( annon != NULL )
 				{
 					notation += TQString( " (%1)" ).tqarg( annon->text );
 					showLineNumber = true;
 				}
 				/* Insert Annotations */
-				annon = annotations.tqfind( tmp );
+				annon = annotations.find( tmp );
 				if( annon != NULL )
 				{
 					notation += TQString( " {%1}" ).tqarg( annon->text );
@@ -290,7 +290,7 @@ void pgn::init( void )
 	/* Build Date */
 	qdt = TQDateTime::tqcurrentDateTime();
 	TAG_Date = TQString("%1.%2.%3").tqarg(qdt.date().year(),4).tqarg(qdt.date().month(),2).tqarg(qdt.date().day(),2);
-	TAG_Date = TAG_Date.tqreplace( TQRegExp("\\s"), TQString("0") );
+	TAG_Date = TAG_Date.replace( TQRegExp("\\s"), TQString("0") );
 	TAG_Time = qdt.time().toString();
 
 	TAG_Site = unamePtr.nodename;
@@ -670,7 +670,7 @@ bool pgn::save( TQString URL )
 	{
 		while( SAN.at( pos ) != ' ' )
 			pos--;
-		SAN = SAN.tqreplace( pos, 1, TQString("\n") );
+		SAN = SAN.replace( pos, 1, TQString("\n") );
 		lastPos = pos;
 		pos = lastPos + 80;
 	}
diff --git a/knights/proto_xboard.cpp b/knights/proto_xboard.cpp
index fc90fca..9bdff6b 100644
--- a/knights/proto_xboard.cpp
+++ b/knights/proto_xboard.cpp
@@ -390,15 +390,15 @@ void proto_xboard::parse( const TQString &string )
 		emit output( Command( myID, CMD_Send_SIGINT ) );
 
 	/* Illegal */
-	if( strList[0].tqcontains( "illegal", FALSE ) )
+	if( strList[0].contains( "illegal", FALSE ) )
 	{
 		if( AcceptIllegal )
 		{
-			if( strIn.tqcontains("(no matching move)board") )
+			if( strIn.contains("(no matching move)board") )
 				return;
-			if( strIn.tqcontains("(no matching move)protover") )
+			if( strIn.contains("(no matching move)protover") )
 				return;
-			if( strIn.tqcontains("(no matching move)sd") )
+			if( strIn.contains("(no matching move)sd") )
 				return;
 			AcceptIllegal = FALSE;
 			emit output( Command( myID, CMD_Illegal ) );
@@ -428,7 +428,7 @@ void proto_xboard::parse( const TQString &string )
 	}
 
 	/* A Move ( Old Variation ) */
-	if( ( strList[0].tqcontains( TQRegExp("\\d+\\.") ) ) && ( strList[1] == "..." ) )
+	if( ( strList[0].contains( TQRegExp("\\d+\\.") ) ) && ( strList[1] == "..." ) )
 	{
 		Command::clearMove( &myMove );
 		strcpy( myMove.SAN, strList[2].latin1() );
@@ -522,7 +522,7 @@ void proto_xboard::parse( const TQString &string )
 	}
 
 	/* Resign */
-	if( strIn.tqcontains( "resign", FALSE ) )
+	if( strIn.contains( "resign", FALSE ) )
 	{
 		if( Army == WHITE )
 			emit output( Command( myID, CMD_White_Resign ) );
diff --git a/knights/setpageaudio.cpp b/knights/setpageaudio.cpp
index 9daed0c..f9aac94 100644
--- a/knights/setpageaudio.cpp
+++ b/knights/setpageaudio.cpp
@@ -118,10 +118,10 @@ void setPageAudio::buildThemeList( void )
 		buffer = Resource->getSounds( tmp );
 		if( buffer.isEmpty() ) break;
 		buffer.remove( 0, 2 );
-		buffer.tqreplace( TQRegExp("_"), " " );
-		buffer.tqreplace( TQRegExp(".tar"), "" );
-		buffer.tqreplace( TQRegExp(".gz"), "" );
-		buffer.tqreplace( TQRegExp(".bz2"), "" );
+		buffer.replace( TQRegExp("_"), " " );
+		buffer.replace( TQRegExp(".tar"), "" );
+		buffer.replace( TQRegExp(".gz"), "" );
+		buffer.replace( TQRegExp(".bz2"), "" );
 		Current_Theme->insertItem( buffer, tmp );
 		if( Resource->getSounds() == Resource->getSounds( tmp ) )
 		{
diff --git a/knights/setpagedisplay.cpp b/knights/setpagedisplay.cpp
index a0e6bd9..af7ffa4 100644
--- a/knights/setpagedisplay.cpp
+++ b/knights/setpagedisplay.cpp
@@ -483,10 +483,10 @@ void setPageDisplay::buildThemeList( void )
 		buffer = Resource->getBoard( tmp );
 		if( buffer.isEmpty() ) break;
 		buffer.remove( 0, 2 );
-		buffer.tqreplace( TQRegExp("_"), " " );
-		buffer.tqreplace( TQRegExp(".tar"), "" );
-		buffer.tqreplace( TQRegExp(".gz"), "" );
-		buffer.tqreplace( TQRegExp(".bz2"), "" );
+		buffer.replace( TQRegExp("_"), " " );
+		buffer.replace( TQRegExp(".tar"), "" );
+		buffer.replace( TQRegExp(".gz"), "" );
+		buffer.replace( TQRegExp(".bz2"), "" );
 		Current_Boards->insertItem( buffer, tmp );
 		if( Resource->getBoard() == Resource->getBoard( tmp ) )
 		{
@@ -502,10 +502,10 @@ void setPageDisplay::buildThemeList( void )
 		buffer = Resource->getChessmen( tmp );
 		if( buffer.isEmpty() ) break;
 		buffer.remove( 0, 2 );
-		buffer.tqreplace( TQRegExp("_"), " " );
-		buffer.tqreplace( TQRegExp(".tar"), "" );
-		buffer.tqreplace( TQRegExp(".gz"), "" );
-		buffer.tqreplace( TQRegExp(".bz2"), "" );
+		buffer.replace( TQRegExp("_"), " " );
+		buffer.replace( TQRegExp(".tar"), "" );
+		buffer.replace( TQRegExp(".gz"), "" );
+		buffer.replace( TQRegExp(".bz2"), "" );
 		Current_Chessmen->insertItem( buffer, tmp );
 		if( Resource->getChessmen() == Resource->getChessmen( tmp ) )
 		{
diff --git a/knights/tab_pgnview.cpp b/knights/tab_pgnview.cpp
index 75a1fda..51bf57c 100644
--- a/knights/tab_pgnview.cpp
+++ b/knights/tab_pgnview.cpp
@@ -60,43 +60,43 @@ tab_pgnView::~tab_pgnView()
 void tab_pgnView::init( void )
 {
 	/* Replace macros with data */
-	document.tqreplace( TQRegExp( "%site%" ), myParent->TAG_Site );
-	document.tqreplace( TQRegExp( "%date%" ), myParent->TAG_Date );
-	document.tqreplace( TQRegExp( "%round%" ), myParent->TAG_Round );
-	document.tqreplace( TQRegExp( "%result%" ), myParent->TAG_Result );
-	document.tqreplace( TQRegExp( "%white%" ), myParent->TAG_White );
-	document.tqreplace( TQRegExp( "%whitetitle%" ), myParent->TAG_WhiteTitle );
-	document.tqreplace( TQRegExp( "%whiteelo%" ), myParent->TAG_WhiteElo );
-	document.tqreplace( TQRegExp( "%whiteuscf%" ), myParent->TAG_WhiteUSCF );
-	document.tqreplace( TQRegExp( "%whitena%" ), myParent->TAG_WhiteNA );
-	document.tqreplace( TQRegExp( "%whitetype%" ), myParent->TAG_WhiteType );
-	document.tqreplace( TQRegExp( "%black%" ), myParent->TAG_Black );
-	document.tqreplace( TQRegExp( "%blacktitle%" ), myParent->TAG_BlackTitle );
-	document.tqreplace( TQRegExp( "%blackelo%" ), myParent->TAG_BlackElo );
-	document.tqreplace( TQRegExp( "%blackuscf%" ), myParent->TAG_BlackUSCF );
-	document.tqreplace( TQRegExp( "%blackna%" ), myParent->TAG_BlackNA );
-	document.tqreplace( TQRegExp( "%blacktype%" ), myParent->TAG_BlackType );
-	document.tqreplace( TQRegExp( "%time%" ), myParent->TAG_Time );
-	document.tqreplace( TQRegExp( "%utctime%" ), myParent->TAG_UTCTime );
-	document.tqreplace( TQRegExp( "%utcdate%" ), myParent->TAG_UTCDate );
-	document.tqreplace( TQRegExp( "%event%" ), myParent->TAG_Event );
-	document.tqreplace( TQRegExp( "%eventdate%" ), myParent->TAG_EventDate );
-	document.tqreplace( TQRegExp( "%eventsponsor"), myParent->TAG_EventSponsor );
-	document.tqreplace( TQRegExp( "%section%" ), myParent->TAG_Section );
-	document.tqreplace( TQRegExp( "%stage%" ), myParent->TAG_Stage );
-	document.tqreplace( TQRegExp( "%board%" ), myParent->TAG_Board );
-	document.tqreplace( TQRegExp( "%opening%" ), myParent->TAG_Opening );
-	document.tqreplace( TQRegExp( "%variation%" ), myParent->TAG_Variation );
-	document.tqreplace( TQRegExp( "%subvariation%" ), myParent->TAG_SubVariation );
-	document.tqreplace( TQRegExp( "%eco%" ), myParent->TAG_ECO );
-	document.tqreplace( TQRegExp( "%nic%" ), myParent->TAG_NIC );
-	document.tqreplace( TQRegExp( "%timecontrol%" ), myParent->TAG_TimeControl );
-	document.tqreplace( TQRegExp( "%termination%" ), myParent->TAG_Termination );
-	document.tqreplace( TQRegExp( "%setup%" ), myParent->TAG_SetUp );
-	document.tqreplace( TQRegExp( "%fen%" ), myParent->TAG_FEN );
-	document.tqreplace( TQRegExp( "%annotator%" ), myParent->TAG_Annotator );
-	document.tqreplace( TQRegExp( "%mode%" ), myParent->TAG_Mode );
-	document.tqreplace( TQRegExp( "%plycount%" ), myParent->TAG_PlyCount );
+	document.replace( TQRegExp( "%site%" ), myParent->TAG_Site );
+	document.replace( TQRegExp( "%date%" ), myParent->TAG_Date );
+	document.replace( TQRegExp( "%round%" ), myParent->TAG_Round );
+	document.replace( TQRegExp( "%result%" ), myParent->TAG_Result );
+	document.replace( TQRegExp( "%white%" ), myParent->TAG_White );
+	document.replace( TQRegExp( "%whitetitle%" ), myParent->TAG_WhiteTitle );
+	document.replace( TQRegExp( "%whiteelo%" ), myParent->TAG_WhiteElo );
+	document.replace( TQRegExp( "%whiteuscf%" ), myParent->TAG_WhiteUSCF );
+	document.replace( TQRegExp( "%whitena%" ), myParent->TAG_WhiteNA );
+	document.replace( TQRegExp( "%whitetype%" ), myParent->TAG_WhiteType );
+	document.replace( TQRegExp( "%black%" ), myParent->TAG_Black );
+	document.replace( TQRegExp( "%blacktitle%" ), myParent->TAG_BlackTitle );
+	document.replace( TQRegExp( "%blackelo%" ), myParent->TAG_BlackElo );
+	document.replace( TQRegExp( "%blackuscf%" ), myParent->TAG_BlackUSCF );
+	document.replace( TQRegExp( "%blackna%" ), myParent->TAG_BlackNA );
+	document.replace( TQRegExp( "%blacktype%" ), myParent->TAG_BlackType );
+	document.replace( TQRegExp( "%time%" ), myParent->TAG_Time );
+	document.replace( TQRegExp( "%utctime%" ), myParent->TAG_UTCTime );
+	document.replace( TQRegExp( "%utcdate%" ), myParent->TAG_UTCDate );
+	document.replace( TQRegExp( "%event%" ), myParent->TAG_Event );
+	document.replace( TQRegExp( "%eventdate%" ), myParent->TAG_EventDate );
+	document.replace( TQRegExp( "%eventsponsor"), myParent->TAG_EventSponsor );
+	document.replace( TQRegExp( "%section%" ), myParent->TAG_Section );
+	document.replace( TQRegExp( "%stage%" ), myParent->TAG_Stage );
+	document.replace( TQRegExp( "%board%" ), myParent->TAG_Board );
+	document.replace( TQRegExp( "%opening%" ), myParent->TAG_Opening );
+	document.replace( TQRegExp( "%variation%" ), myParent->TAG_Variation );
+	document.replace( TQRegExp( "%subvariation%" ), myParent->TAG_SubVariation );
+	document.replace( TQRegExp( "%eco%" ), myParent->TAG_ECO );
+	document.replace( TQRegExp( "%nic%" ), myParent->TAG_NIC );
+	document.replace( TQRegExp( "%timecontrol%" ), myParent->TAG_TimeControl );
+	document.replace( TQRegExp( "%termination%" ), myParent->TAG_Termination );
+	document.replace( TQRegExp( "%setup%" ), myParent->TAG_SetUp );
+	document.replace( TQRegExp( "%fen%" ), myParent->TAG_FEN );
+	document.replace( TQRegExp( "%annotator%" ), myParent->TAG_Annotator );
+	document.replace( TQRegExp( "%mode%" ), myParent->TAG_Mode );
+	document.replace( TQRegExp( "%plycount%" ), myParent->TAG_PlyCount );
 
 	/* Get the White Player's Image */
 	TQPixmap wi = myResource->loadSCIDImage( myParent->TAG_White );
@@ -110,7 +110,7 @@ void tab_pgnView::init( void )
 	whiteImage = new KTempFile();
 	whiteImage->setAutoDelete( TRUE );
 	wi.save( whiteImage->name(), "PNG" );
-	document.tqreplace( TQRegExp( "%whiteimage%" ), whiteImage->name() );
+	document.replace( TQRegExp( "%whiteimage%" ), whiteImage->name() );
 
 	/* Get the Black Player's Image */
 	TQPixmap bi = myResource->loadSCIDImage( myParent->TAG_Black );
@@ -124,7 +124,7 @@ void tab_pgnView::init( void )
 	blackImage = new KTempFile();
 	blackImage->setAutoDelete( TRUE );
 	bi.save( blackImage->name(), "PNG" );
-	document.tqreplace( TQRegExp( "%blackimage%" ), blackImage->name() );
+	document.replace( TQRegExp( "%blackimage%" ), blackImage->name() );
 
 	/* Obtain the move data */
 	TQString moves;
@@ -141,16 +141,16 @@ void tab_pgnView::init( void )
 	/* Do some formatting and then merge the strings */
 	for( TQStringList::Iterator i = list->begin(); i != list->end(); i++ )
 	{
-		(*i).tqreplace( TQRegExp( "[^\\0040-\\0176]" ), "" );
-		(*i).tqreplace( TQRegExp( "\\(" ), "<i>(" );
-		(*i).tqreplace( TQRegExp( "\\)" ), ")</i>" );
-		(*i).tqreplace( TQRegExp( "\\{" ), "<b>{" );
-		(*i).tqreplace( TQRegExp( "\\}" ), "}</b>" );
+		(*i).replace( TQRegExp( "[^\\0040-\\0176]" ), "" );
+		(*i).replace( TQRegExp( "\\(" ), "<i>(" );
+		(*i).replace( TQRegExp( "\\)" ), ")</i>" );
+		(*i).replace( TQRegExp( "\\{" ), "<b>{" );
+		(*i).replace( TQRegExp( "\\}" ), "}</b>" );
 	}
 	moves = list->join( " " );
 	delete list;
 
-	int pos = document.tqfind( "%moves%" );
+	int pos = document.find( "%moves%" );
 	if( pos != -1 )
 	{
 		document.remove( (unsigned int)pos, 7 );
diff --git a/knights/tab_seeklist.cpp b/knights/tab_seeklist.cpp
index 0130bc8..d5eb774 100644
--- a/knights/tab_seeklist.cpp
+++ b/knights/tab_seeklist.cpp
@@ -138,7 +138,7 @@ void tab_SeekList::display_menuSeek( TQListViewItem *Item, const TQPoint &Pos, i
 	if( Item != NULL )
 	{
 		setSelected( Item, TRUE );
-		selectedPlayerName = Item->text(0).tqreplace( TQRegExp("\\(.+\\)"), TQString("") );
+		selectedPlayerName = Item->text(0).replace( TQRegExp("\\(.+\\)"), TQString("") );
 		selectedMatchID = Item->text(6).toInt();
 		enable = TRUE;
 	}
diff --git a/knights/tabmanager.cpp b/knights/tabmanager.cpp
index efd4899..2057cb1 100644
--- a/knights/tabmanager.cpp
+++ b/knights/tabmanager.cpp
@@ -88,7 +88,7 @@ void TabManager::removeTab( TQObject *child )
 		return;
 	}
 
-	if( myList.tqfind( ((TabBox*)child) ) != -1 )
+	if( myList.find( ((TabBox*)child) ) != -1 )
 	{
 		/* Remove Child Directly */
 		myList.remove( ((TabBox*)child) );
diff --git a/knights/thinbuttons.cpp b/knights/thinbuttons.cpp
index 74457e3..b619bad 100644
--- a/knights/thinbuttons.cpp
+++ b/knights/thinbuttons.cpp
@@ -111,10 +111,10 @@ void thinbuttons::setButton( int id )
 }
 ///////////////////////////////////////
 //
-//	thinbuttons::tqfind
+//	thinbuttons::find
 //
 ///////////////////////////////////////
-TQButton* thinbuttons::tqfind( int id )
+TQButton* thinbuttons::find( int id )
 {
 	unsigned int tmp;
 
@@ -157,7 +157,7 @@ void thinbuttons::remove( const int &id )
 {
 	TQButton *butt;
 
-	butt = tqfind(id);
+	butt = find(id);
 	if( butt != NULL )
 	{
 		remove( butt );
diff --git a/knights/thinbuttons.h b/knights/thinbuttons.h
index d933fb7..72d1dd0 100644
--- a/knights/thinbuttons.h
+++ b/knights/thinbuttons.h
@@ -42,7 +42,7 @@ class thinbuttons : public TQFrame
 								~thinbuttons();
 		void				mousePressEvent( TQMouseEvent *event );
 		void				setButton( int id );
-		TQButton*		tqfind( int id );
+		TQButton*		find( int id );
 		TQButton*		create( int id );
 		void				remove( TQButton* button );
 		void				remove( const int &id );