1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 45121c34..8ecb59f0 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -66,7 +66,7 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ
 	actionModeI = new KToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this );
 	actionHomePage = 0L;
 
-	updatetqStatus();
+	updateStatus();
 }
 
 IRCChannelContact::~IRCChannelContact()
@@ -77,10 +77,10 @@ void IRCChannelContact::slotUpdateInfo()
 {
 	/** This woudl be nice, but it generates server errors too often
 
-	if( !manager(Kopete::Contact::CannotCreate) && onlinetqStatus() == m_protocol->m_ChannelStatusOnline )
-		kircEngine()->writeMessage( TQString::tqfromLatin1("LIST %1").tqarg(m_nickName) );
+	if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline )
+		kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").tqarg(m_nickName) );
 	else
-		setProperty( TQString::tqfromLatin1("channelMembers"), i18n("Members"), manager()->members().count() );
+		setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() );
 
 	*/
 	KIRC::Engine *engine = kircEngine();
@@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo()
 	if (manager(Kopete::Contact::CannotCreate))
 	{
 		setProperty(m_protocol->propChannelMembers, manager()->members().count());
-		engine->writeMessage(TQString::tqfromLatin1("WHO %1").tqarg(m_nickName));
+		engine->writeMessage(TQString::fromLatin1("WHO %1").tqarg(m_nickName));
 	}
 	else
 	{
@@ -102,7 +102,7 @@ void IRCChannelContact::slotUpdateInfo()
 void IRCChannelContact::slotChannelListed( const TQString &channel, uint members, const TQString &topic )
 {
 	if (!manager(Kopete::Contact::CannotCreate) &&
-		onlinetqStatus() == m_protocol->m_ChannelStatusOnline &&
+		onlineStatus() == m_protocol->m_ChannelStatusOnline &&
 		channel.lower() == m_nickName.lower())
 	{
 		mTopic = topic;
@@ -126,9 +126,9 @@ void IRCChannelContact::toggleOperatorActions(bool enabled)
 	actionModeI->setEnabled(enabled);
 }
 
-void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus)
+void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus)
 {
-	Q_UNUSED(oldtqStatus);
+	Q_UNUSED(oldStatus);
 
 	if (c == account()->myself()) {
 		if (status.internalStatus() & IRCProtocol::Operator) { 
@@ -141,9 +141,9 @@ void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete
 	}
 }
 
-void IRCChannelContact::updatetqStatus()
+void IRCChannelContact::updateStatus()
 {
-	KIRC::Engine::tqStatus status = kircEngine()->status();
+	KIRC::Engine::Status status = kircEngine()->status();
 	switch (status)
 	{
 		case KIRC::Engine::Idle:
@@ -251,7 +251,7 @@ void IRCChannelContact::slotAddNicknames()
 		else if( firstChar == '+')
 			status = m_protocol->m_UserStatusVoice;
 		else
-			status = user->onlinetqStatus();
+			status = user->onlineStatus();
 
 		if( user != account->mySelf() )
 			manager()->addContact(user , status, true);
@@ -292,7 +292,7 @@ void IRCChannelContact::channelHomePage(const TQString &url)
 void IRCChannelContact::join()
 {
 	if (!manager(Kopete::Contact::CannotCreate) &&
-		onlinetqStatus().status() == Kopete::OnlineStatus::Online)
+		onlineStatus().status() == Kopete::OnlineStatus::Online)
 	{
 		kdDebug() << k_funcinfo << "My nickname:" << m_nickName << endl;
 		kdDebug() << k_funcinfo << "My manager:" << manager(Kopete::Contact::CannotCreate) << endl;
@@ -636,9 +636,9 @@ void IRCChannelContact::toggleMode( TQChar mode, bool enabled, bool update )
 		if( modeMap[mode] != enabled )
 		{
 			if( enabled )
-				setMode( TQString::tqfromLatin1("+") + mode );
+				setMode( TQString::fromLatin1("+") + mode );
 			else
-				setMode( TQString::tqfromLatin1("-") + mode );
+				setMode( TQString::fromLatin1("-") + mode );
 		}
 	}
 
@@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage()
 
 const TQString IRCChannelContact::caption() const
 {
-	TQString cap = TQString::tqfromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
+	TQString cap = TQString::fromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
 	if(!mTopic.isEmpty())
-		cap.append( TQString::tqfromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) );
+		cap.append( TQString::fromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) );
 
 	return cap;
 }