From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- kopete/protocols/oscar/icq/icqcontact.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kopete/protocols/oscar/icq/icqcontact.cpp') diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 30563ae0..d5f1245c 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() ); @@ -121,8 +121,8 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de 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() ) { @@ -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 *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) -- cgit v1.2.1