6 files changed, 22 insertions, 22 deletions

diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 167d7a22..786b4594 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -277,7 +277,7 @@ bool Engine::_bind(TQDict<KIRC::MessageRedirector> &dict,
 	if (!mr)
 	{
 		mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage);
-		dict.tqreplace(command, mr);
+		dict.replace(command, mr);
 	}
 
 	return mr->connect(object, member);
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index e086afc1..ac3fb00c 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -175,7 +175,7 @@ public:
 		{ return m_status == Connected; }
 
 	inline void setCodec( const TQString &nick, const TQTextCodec *codec )
-		{ codecs.tqreplace( nick, codec ); }
+		{ codecs.replace( nick, codec ); }
 
 	/* Custom CTCP replies handling */
 	inline TQString &customCtcp( const TQString &s )
diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
index 83a4257c..05477710 100644
--- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
@@ -143,8 +143,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
 		{
 			TQFileInfo file(fileName);
 			TQString noWhiteSpace = file.fileName();
-			if (noWhiteSpace.tqcontains(' ') > 0)
-				noWhiteSpace.tqreplace(TQRegExp("\\s+"), "_");
+			if (noWhiteSpace.contains(' ') > 0)
+				noWhiteSpace.replace(TQRegExp("\\s+"), "_");
 
 			TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size());
 
@@ -284,7 +284,7 @@ void Engine::CtcpReply_ping(Message &msg)
 		if (difference < 1)
 		{
 			diffString = TQString::number(difference);
-			diffString.remove((diffString.tqfind('.') -1), 2);
+			diffString.remove((diffString.find('.') -1), 2);
 			diffString.truncate(3);
 			diffString.append("milliseconds");
 		}
@@ -293,7 +293,7 @@ void Engine::CtcpReply_ping(Message &msg)
 			diffString = TQString::number(difference);
 			TQString seconds = diffString.section('.', 0, 0);
 			TQString millSec = diffString.section('.', 1, 1);
-			millSec.remove(millSec.tqfind('.'), 1);
+			millSec.remove(millSec.find('.'), 1);
 			millSec.truncate(3);
 			diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
 		}
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index 0c1d3ef0..6f45b0c1 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -201,10 +201,10 @@ TQString Message::quote(const TQString &str)
 {
 	TQString tmp = str;
 	TQChar q('\020');
-	tmp.tqreplace(q, q+TQString(q));
-	tmp.tqreplace(TQChar('\r'), q+TQString::tqfromLatin1("r"));
-	tmp.tqreplace(TQChar('\n'), q+TQString::tqfromLatin1("n"));
-	tmp.tqreplace(TQChar('\0'), q+TQString::tqfromLatin1("0"));
+	tmp.replace(q, q+TQString(q));
+	tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r"));
+	tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n"));
+	tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0"));
 	return tmp;
 }
 
@@ -216,13 +216,13 @@ TQString Message::unquote(const TQString &str)
 	char b[3] = { 020, 020, '\0' };
 	const char b2[2] = { 020, '\0' };
 
-	tmp.tqreplace( b, b2 );
+	tmp.replace( b, b2 );
 	b[1] = 'r';
-	tmp.tqreplace( b, "\r");
+	tmp.replace( b, "\r");
 	b[1] = 'n';
-	tmp.tqreplace( b, "\n");
+	tmp.replace( b, "\n");
 	b[1] = '0';
-	tmp.tqreplace( b, "\0");
+	tmp.replace( b, "\0");
 
 	return tmp;
 }
@@ -230,16 +230,16 @@ TQString Message::unquote(const TQString &str)
 TQString Message::ctcpQuote(const TQString &str)
 {
 	TQString tmp = str;
-	tmp.tqreplace( TQChar('\\'), TQString::tqfromLatin1("\\\\"));
-	tmp.tqreplace( (char)1, TQString::tqfromLatin1("\\1"));
+	tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\"));
+	tmp.replace( (char)1, TQString::tqfromLatin1("\\1"));
 	return tmp;
 }
 
 TQString Message::ctcpUnquote(const TQString &str)
 {
 	TQString tmp = str;
-	tmp.tqreplace("\\\\", "\\");
-	tmp.tqreplace("\\1", "\1" );
+	tmp.replace("\\\\", "\\");
+	tmp.replace("\\1", "\1" );
 	return tmp;
 }
 
@@ -276,7 +276,7 @@ bool Message::matchForIRCRegExp(TQRegExp &regexp, const TQTextCodec *codec, cons
 				msg.m_ctcpMessage = new Message();
 				msg.m_ctcpMessage->m_raw = codec->fromUnicode(ctcpUnquote(msg.m_ctcpRaw));
 
-				int space = ctcpRaw.tqfind(' ');
+				int space = ctcpRaw.find(' ');
 				if (!matchForIRCRegExp(msg.m_ctcpMessage->m_raw, codec, *msg.m_ctcpMessage))
 				{
 					TQCString command;
diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h
index 80dcfa79..fb38a476 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.h
+++ b/kopete/protocols/irc/libkirc/kircmessage.h
@@ -112,7 +112,7 @@ public:
 	inline const TQString &command() const
 		{ return m_command; }
 
-	/** \brief The number of command arguments this message tqcontains.
+	/** \brief The number of command arguments this message contains.
 	 */
 	inline size_t argsSize() const
 		{ return m_args.size(); }
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index f14f1a3e..4dcf9ce8 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -206,12 +206,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
 
 bool KSSLSocket::hasMetaData( const TQString &key )
 {
-	return d->metaData.tqcontains(key);
+	return d->metaData.contains(key);
 }
 
 TQString KSSLSocket::metaData( const TQString &key )
 {
-	if( d->metaData.tqcontains(key) )
+	if( d->metaData.contains(key) )
 		return d->metaData[key];
 	return TQString();
 }