1 files changed, 21 insertions, 21 deletions

diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 30563ae0..e4943c37 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -103,7 +103,7 @@ void ICQContact::updateSSIItem()
 		setOnlineStatus( mProtocol->statusManager()->waitingForAuth() );
 
 	if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
-	     onlinetqStatus() == Kopete::OnlineStatus::Unknown )
+	     onlineStatus() == Kopete::OnlineStatus::Unknown )
 	{
 		//make sure they're offline
 		setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() );
@@ -117,12 +117,12 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 	if ( Oscar::normalize( contact  ) != Oscar::normalize( contactId() ) )
 		return;
 
-	// tqinvalidate old away message if user was offline
+	// invalidate old away message if user was offline
 	if ( !isOnline() )
 		removeProperty( mProtocol->awayMessage );
 
-	kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedtqStatus() << endl;
-	ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 0xffff );
+	kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedStatus() << endl;
+	ICQ::Presence presence = ICQ::Presence::fromOscarStatus( details.extendedStatus() & 0xffff );
 	setOnlineStatus( presence.toOnlineStatus() );
 
 	// ICQ does not support status messages for state Online
@@ -133,7 +133,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 	}
 	else
 	{
-		if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlinetqStatus() ).visibility() == ICQ::Presence::Visible )
+		if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlineStatus() ).visibility() == ICQ::Presence::Visible )
 		{
 			switch ( presence.type() )
 			{
@@ -276,8 +276,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas
 	if( granted )
 	{
 		message = i18n( "User %1 has granted your authorization request.\nReason: %2" )
-			.tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
-			.tqarg( reason );
+			.arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
+			.arg( reason );
 
 		// remove the unknown status
 		setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() );
@@ -285,8 +285,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas
 	else
 	{
 		message = i18n( "User %1 has rejected the authorization request.\nReason: %2" )
-			.tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
-			.tqarg( reason );
+			.arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
+			.arg( reason );
 	}
 	KNotifyClient::event( Kopete::UI::Global::sysTrayWId(), "icq_authorization", message );
 }
@@ -539,7 +539,7 @@ void ICQContact::slotContactChanged(const UserInfo &u)
 		if (!mInfo.clientVersion.isEmpty())
 		{
 			capList << i18n("Translators: client-name client-version",
-				"%1 %2").tqarg(mInfo.clientName, mInfo.clientVersion);
+				"%1 %2").arg(mInfo.clientName, mInfo.clientVersion);
 		}
 		else
 		{
@@ -561,27 +561,27 @@ void ICQContact::slotContactChanged(const UserInfo &u)
 	else
 		removeProperty(mProtocol->clientFeatures);
 
-	unsigned int newtqStatus = 0;
+	unsigned int newStatus = 0;
 	mInvisible = (mInfo.icqextstatus & ICQ_STATUS_IS_INVIS);
 
 	if (mInfo.icqextstatus & ICQ_STATUS_IS_FFC)
-		newtqStatus = OSCAR_FFC;
+		newStatus = OSCAR_FFC;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_DND)
-		newtqStatus = OSCAR_DND;
+		newStatus = OSCAR_DND;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_OCC)
-		newtqStatus = OSCAR_OCC;
+		newStatus = OSCAR_OCC;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_NA)
-		newtqStatus = OSCAR_NA;
+		newStatus = OSCAR_NA;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_AWAY)
-		newtqStatus = OSCAR_AWAY;
+		newStatus = OSCAR_AWAY;
 	else
-		newtqStatus = OSCAR_ONLINE;
+		newStatus = OSCAR_ONLINE;
 
 	if (this != account()->myself())
 	{
-		if(newtqStatus != onlinetqStatus().internalStatus())
+		if(newStatus != onlineStatus().internalStatus())
 		{
-			if(newtqStatus != OSCAR_ONLINE) // if user changed to some state other than online
+			if(newStatus != OSCAR_ONLINE) // if user changed to some state other than online
 			{
 				mAccount->engine()->requestAwayMessage(this);
 			}
@@ -592,7 +592,7 @@ void ICQContact::slotContactChanged(const UserInfo &u)
 		}
 	}
 
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 void ICQContact::slotOffgoingBuddy(TQString sender)
@@ -655,7 +655,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
 /*
 	TQString awTxt;
 	TQString awIcn;
-	unsigned int status = onlinetqStatus().internalStatus();
+	unsigned int status = onlineStatus().internalStatus();
 	if (status >= 15)
 		status -= 15; // get rid of invis addon
 	switch(status)