Rename old tq methods that no longer need a unique name

1 files changed, 15 insertions, 15 deletions

diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
index 05477710..0159f790 100644
--- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
@@ -109,10 +109,10 @@ bool Engine::CtcpReply_action(Message &msg)
 //	FIXME: the API can now answer to help commands.
 void Engine::CtcpQuery_clientinfo(Message &msg)
 {
-	TQString clientinfo = customCtcpMap[ TQString::tqfromLatin1("clientinfo") ];
+	TQString clientinfo = customCtcpMap[ TQString::fromLatin1("clientinfo") ];
 
 	if (clientinfo.isNull())
-		clientinfo = TQString::tqfromLatin1("The following commands are supported, but "
+		clientinfo = TQString::fromLatin1("The following commands are supported, but "
 			"without sub-command help: VERSION, CLIENTINFO, USERINFO, TIME, SOURCE, PING,"
 			"ACTION.");
 
@@ -132,8 +132,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
 		case Transfer::Chat:
 		{
 			writeCtcpQueryMessage(nickname, TQString(),
-				TQString::tqfromLatin1("DCC"),
-				TQStringList(TQString::tqfromLatin1("CHAT")) << TQString::tqfromLatin1("chat") <<
+				TQString::fromLatin1("DCC"),
+				TQStringList(TQString::fromLatin1("CHAT")) << TQString::fromLatin1("chat") <<
 					m_sock->localAddress()->nodeName() << TQString::number(port)
 			);
 			break;
@@ -154,8 +154,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
 			kdDebug(14120) << "Starting DCC file outgoing transfer." << endl;
 
 			writeCtcpQueryMessage(nickname, TQString(),
-				TQString::tqfromLatin1("DCC"),
-				TQStringList(TQString::tqfromLatin1("SEND")) << noWhiteSpace << ipNumber <<
+				TQString::fromLatin1("DCC"),
+				TQStringList(TQString::fromLatin1("SEND")) << noWhiteSpace << ipNumber <<
 					TQString::number(server->port()) << TQString::number(file.size())
 			);
 			break;
@@ -173,7 +173,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
 	Message &ctcpMsg = msg.ctcpMessage();
 	TQString dccCommand = ctcpMsg.arg(0).upper();
 
-	if (dccCommand == TQString::tqfromLatin1("CHAT"))
+	if (dccCommand == TQString::fromLatin1("CHAT"))
 	{
 //		if(ctcpMsg.argsSize()!=4) return false;
 
@@ -196,7 +196,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
 				Transfer::Chat );
 		}
 	}
-	else if (dccCommand == TQString::tqfromLatin1("SEND"))
+	else if (dccCommand == TQString::fromLatin1("SEND"))
 	{
 //		if(ctcpMsg.argsSize()!=5) return false;
 
@@ -253,7 +253,7 @@ void Engine::CtcpRequest_ping(const TQString &target)
 		TQString timeReply;
 
 		if( Entity::isChannel(target) )
-			timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+			timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
 		else
 		 	timeReply = TQString::number( time.tv_sec );
 
@@ -275,7 +275,7 @@ void Engine::CtcpReply_ping(Message &msg)
 	if (gettimeofday(&time, 0) == 0)
 	{
 		// FIXME: the time code is wrong for usec
-		TQString timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+		TQString timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
 		double newTime = timeReply.toDouble();
 		double oldTime = msg.suffix().section(' ',0, 0).toDouble();
 		double difference = newTime - oldTime;
@@ -295,10 +295,10 @@ void Engine::CtcpReply_ping(Message &msg)
 			TQString millSec = diffString.section('.', 1, 1);
 			millSec.remove(millSec.find('.'), 1);
 			millSec.truncate(3);
-			diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
+			diffString = TQString::fromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
 		}
 
-		emit incomingCtcpReply(TQString::tqfromLatin1("PING"), msg.nickFromPrefix(), diffString);
+		emit incomingCtcpReply(TQString::fromLatin1("PING"), msg.nickFromPrefix(), diffString);
 	}
 //	else
 //		((MessageRedirector *)sender())->error("failed to get current time");
@@ -313,13 +313,13 @@ void Engine::CtcpQuery_source(Message &msg)
 void Engine::CtcpQuery_time(Message &msg)
 {
 	writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(),
-			      msg.ctcpMessage().command(), TQDateTime::tqcurrentDateTime().toString(),
+			      msg.ctcpMessage().command(), TQDateTime::currentDateTime().toString(),
 			      TQString(), false);
 }
 
 void Engine::CtcpQuery_userinfo(Message &msg)
 {
-	TQString userinfo = customCtcpMap[ TQString::tqfromLatin1("userinfo") ];
+	TQString userinfo = customCtcpMap[ TQString::fromLatin1("userinfo") ];
 
 	if (userinfo.isNull())
 		userinfo = m_UserString;
@@ -335,7 +335,7 @@ void Engine::CtcpRequest_version(const TQString &target)
 
 void Engine::CtcpQuery_version(Message &msg)
 {
-	TQString response = customCtcpMap[ TQString::tqfromLatin1("version") ];
+	TQString response = customCtcpMap[ TQString::fromLatin1("version") ];
 	kdDebug(14120) << "Version check: " << response << endl;
 
 	if (response.isNull())