1 files changed, 12 insertions, 12 deletions

diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 319df782..b5519ed8 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping )
 	if( !isTyping )
 		return;
 
-	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+	if ( onlineStatus() != Connected || m_chatMembers.empty())
 	{
 		//we are not yet in a chat.
 		//if we send that command now, we may get disconnected.
@@ -653,7 +653,7 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin
 // this sends a short message to the server
 int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 {
-	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+	if ( onlineStatus() != Connected || m_chatMembers.empty())
 	{
 //		m_messagesQueue.append(msg);
 		return -1;
@@ -1021,19 +1021,19 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms
 		     * emoticons like that. So, in that case, we show like the MSN client */
 			#if 0
 			TQString em = TQRegExp::escape( es );
-			message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
-								TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") +
+			message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
+								TQString::fromLatin1("\\1<img align=\"center\" width=\"") +
 			#endif
 			//match any occurence which is not in a html tag.
-			message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
-						TQString::tqfromLatin1("<img align=\"center\" width=\"") +
+			message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
+						TQString::fromLatin1("<img align=\"center\" width=\"") +
 						TQString::number(iconImage.width()) +
-						TQString::tqfromLatin1("\" height=\"") +
+						TQString::fromLatin1("\" height=\"") +
 						TQString::number(iconImage.height()) +
-						TQString::tqfromLatin1("\" src=\"") + imgPath +
-						TQString::tqfromLatin1("\" title=\"") + es +
-						TQString::tqfromLatin1("\" alt=\"") + es +
-						TQString::tqfromLatin1( "\"/>" ) );
+						TQString::fromLatin1("\" src=\"") + imgPath +
+						TQString::fromLatin1("\" title=\"") + es +
+						TQString::fromLatin1("\" alt=\"") + es +
+						TQString::fromLatin1( "\"/>" ) );
 			kmsg.setBody(message, Kopete::Message::RichText);
 		}
 	}
@@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
 	the bad side effect:  some switchboard connection may be maintained for really long time!
 	 */
 	
-	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+	if ( onlineStatus() != Connected || m_chatMembers.empty())
 	{
 		//we are not yet in a chat.
 		//if we send that command now, we may get disconnected.