Rename old tq methods that no longer need a unique name

1 files changed, 7 insertions, 7 deletions

diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 93dc2f0e..89714326 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect()
 	m_isLogged = false;
 	if(	m_disconnectReason==Kopete::Account::Unknown )
 		m_disconnectReason=Kopete::Account::Manual;
-	if( onlinetqStatus() == Connected )
+	if( onlineStatus() == Connected )
 		sendCommand( "OUT", TQString(), false );
 
 	if( m_keepaliveTimer )
 		m_keepaliveTimer->stop();
 
 	// the socket is not connected yet, so I should force the signals
-	if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting )
+	if ( onlineStatus() == Disconnected || onlineStatus() == Connecting )
 		emit socketClosed();
 	else
 		MSNSocket::disconnect();
@@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 			kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl;
 
 		// set the status
-		settqStatus( m_newstatus );
+		setStatus( m_newstatus );
 	}
 	else if( cmd == "BPR" )
 	{
@@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 					"<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n"
 					"<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n"
 					"<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n"
-					"<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n"
+					"<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n"
 					"<input type=\"hidden\" name=\"svc\" value=\"mail\">\n"
 					"<input type=\"hidden\" name=\"js\" value=\"yes\">\n"
 				"</form></body>\n</html>\n";
@@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 			m_msnAlertURLs.append(subscString);
 
 			// Don't do any MSN alerts notification for new blog updates
-			if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") )
+			if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") )
 			{
 				KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions);
 				TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int)));
@@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS
 	m_tmpHandles[id]=handle;
 }
 
-void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status )
+void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status )
 {
 //	kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl;
 
-	if( onlinetqStatus() == Disconnected )
+	if( onlineStatus() == Disconnected )
 		m_newstatus = status;
 	else
 		sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) );