1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp
index 7df5894c..1ed783e1 100644
--- a/kopete/protocols/irc/irccontact.cpp
+++ b/kopete/protocols/irc/irccontact.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 
 #include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include "ircaccount.h"
 #include "kopeteglobal.h"
@@ -67,8 +67,8 @@ IRCContact::IRCContact(IRCContactManager *contactManager, const TQString &nick,
 	TQObject::connect(engine, TQT_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)),
 			this, TQT_SLOT( slotUserDisconnected(const TQString&, const TQString&)));
 
-	TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)),
-			this, TQT_SLOT(updatetqStatus()));
+	TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)),
+			this, TQT_SLOT(updateStatus()));
 
 	engine->setCodec( m_nickName, codec() );
 }
@@ -94,8 +94,8 @@ KIRC::Engine *IRCContact::kircEngine() const
 
 bool IRCContact::isReachable()
 {
-	if (onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
-		onlinetqStatus().status() != Kopete::OnlineStatus::Unknown)
+	if (onlineStatus().status() != Kopete::OnlineStatus::Offline &&
+		onlineStatus().status() != Kopete::OnlineStatus::Unknown)
 		return true;
 
 	return false;
@@ -111,7 +111,7 @@ const TQString IRCContact::formatedName() const
 	return TQString();
 }
 */
-void IRCContact::updatetqStatus()
+void IRCContact::updateStatus()
 {
 }
 
@@ -122,12 +122,12 @@ void IRCContact::privateMessage(IRCContact *, IRCContact *, const TQString &)
 void IRCContact::setCodec(const TQTextCodec *codec)
 {
 	kircEngine()->setCodec(m_nickName, codec);
-	metaContact()->setPluginData(m_protocol, TQString::tqfromLatin1("Codec"), TQString::number(codec->mibEnum()));
+	metaContact()->setPluginData(m_protocol, TQString::fromLatin1("Codec"), TQString::number(codec->mibEnum()));
 }
 
 const TQTextCodec *IRCContact::codec()
 {
-	TQString codecId = metaContact()->pluginData(m_protocol, TQString::tqfromLatin1("Codec"));
+	TQString codecId = metaContact()->pluginData(m_protocol, TQString::fromLatin1("Codec"));
 	TQTextCodec *codec = ircAccount()->codec();
 
 	if( !codecId.isEmpty() )
@@ -186,7 +186,7 @@ void IRCContact::slotUserDisconnected(const TQString &user, const TQString &reas
 		Kopete::Contact *c = locateUser( nickname );
 		if ( c )
 		{
-			m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(reason), Kopete::Message::RichText);
+			m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").arg(reason), Kopete::Message::RichText);
 			c->setOnlineStatus(m_protocol->m_UserStatusOffline);
 		}
 	}
@@ -229,9 +229,9 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *)
 	// Two-liner in color:
 	//   <span style="color:#403897">Hello<br />World</span>
 
-	if (htmlString.find(TQString::tqfromLatin1("</span")) > -1)
+	if (htmlString.find(TQString::fromLatin1("</span")) > -1)
 	{
-		TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") );
+		TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") );
 		findTags.setMinimal( true );
 		int pos = 0;
 
@@ -249,19 +249,19 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *)
 					TQString attribute = (*attrPair).section(':',0,0);
 					TQString value = (*attrPair).section(':',1);
 
-					if( attribute == TQString::tqfromLatin1("color") )
+					if( attribute == TQString::fromLatin1("color") )
 					{
 						int ircColor = KSParser::colorForHTML( value );
 						if( ircColor > -1 )
 							replacement.prepend( TQString( TQChar(0x03) ).append( TQString::number(ircColor) ) ).append( TQChar( 0x03 ) );
 					}
-					else if( attribute == TQString::tqfromLatin1("font-weight") &&
-					             value == TQString::tqfromLatin1("600") ) {
+					else if( attribute == TQString::fromLatin1("font-weight") &&
+					             value == TQString::fromLatin1("600") ) {
 						// Bolding
 						replacement.prepend( TQChar(0x02) ).append( TQChar(0x02) );
 					}
-					else if( attribute == TQString::tqfromLatin1("text-decoration") &&
-					             value == TQString::tqfromLatin1("underline") ) {
+					else if( attribute == TQString::fromLatin1("text-decoration") &&
+					             value == TQString::fromLatin1("underline") ) {
 						replacement.prepend( TQChar(31) ).append( TQChar(31) );
 					}
 				}