Rename a number of old tq methods that are no longer tq specific

1 files changed, 22 insertions, 22 deletions

diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 93dc2f0e..b9dbb921 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();
@@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 		case 205:
 		case 208:
 		{
-			msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( handle );
+			msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).arg( handle );
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 						"MSN Error: %1<br>"
 						"please send us a detailed bug report "
 						"at [email protected] containing the raw debug output on the "
-						"console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code);
+						"console (in gzipped format, as it is probably a lot of output.)" ).arg(code);
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 			msg = i18n( "<qt>The user '%1' already exists in this group on the MSN server;<br>"
 				"if Kopete does not show the user, please send us a detailed bug report "
 				"at [email protected] containing the raw debug output on the "
-				"console (in gzipped format, as it is probably a lot of output.)</qt>" ).tqarg(handle);
+				"console (in gzipped format, as it is probably a lot of output.)</qt>" ).arg(handle);
 			type = MSNSocket::ErrorInformation;
 			break;
 		}
@@ -180,7 +180,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 		}	
 		case 219:
 		{
-			msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle);
+			msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).arg(handle);
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -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";
@@ -775,7 +775,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 		mailCount++;
 
 		//TODO:  it is also possible to get the subject  (but warning about the encoding)
-		TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m),
+		TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m),
 										0 , 0 , i18n( "Open Inbox..." ) ),
 				TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
 	}
@@ -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)));
@@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement )
 	currentMedia = format;
 	for(uint i=0; i<formatterStrings.size(); i++)
 	{
-		currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]);
+		currentMedia = currentMedia.replace(TQString("{%1}").arg(i), formatterStrings[i]);
 	}
 
 	if( type == TQString::fromUtf8("Music") )
 	{
 		// the  "♫" is encoded in utf8 (and should be in utf8)
-		currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(currentMedia);
+		currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia);
 	}
 
 	kdDebug(1414) << "Current Media received: " << currentMedia << endl;
@@ -1049,25 +1049,25 @@ void MSNNotifySocket::addContact( const TQString &handle, int list, const TQStri
 			// Adding the contact to a group
 			if( !contactGuid.isEmpty() )
 			{
-				args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid );
+				args = TQString("FL C=%1 %2").arg( contactGuid ).arg( groupGuid );
 				kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl;
 			}
 			// Adding a new contact
 			else
 			{
-				args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) );
+				args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) );
 				kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl;
 			}
 			break;
 		}
 		case MSNProtocol::AL:
-			args = TQString("AL N=%1").tqarg( handle );
+			args = TQString("AL N=%1").arg( handle );
 			break;
 		case MSNProtocol::BL:
-			args = TQString("BL N=%1").tqarg( handle );
+			args = TQString("BL N=%1").arg( handle );
 			break;
 		case MSNProtocol::RL:
-			args = TQString("RL N=%1").tqarg( handle );
+			args = TQString("RL N=%1").arg( handle );
 			break;
 		default:
 			kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl;
@@ -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()) );
@@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty
 			if( !mediaList[0].isEmpty() ) // Current Track
 			{
 				xmlCurrentMedia += "{0}";
-				formatterArguments += TQString("%1\\0").tqarg(mediaList[0]);
+				formatterArguments += TQString("%1\\0").arg(mediaList[0]);
 			}
 			if( !mediaList[1].isEmpty() ) // Current Artist
 			{
 				xmlCurrentMedia += " - {1}";
-				formatterArguments += TQString("%1\\0").tqarg(mediaList[1]);
+				formatterArguments += TQString("%1\\0").arg(mediaList[1]);
 			}
 			if( !mediaList[2].isEmpty() ) // Current Album
 			{
 				xmlCurrentMedia += " ({2})";
-				formatterArguments += TQString("%1\\0").tqarg(mediaList[2]);
+				formatterArguments += TQString("%1\\0").arg(mediaList[2]);
 			}
 			xmlCurrentMedia += "\\0" + formatterArguments + "\\0";
 			break;