From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kopete/protocols/oscar/icq/icqpresence.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kopete/protocols/oscar/icq/icqpresence.cpp') diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp index 520153a6..b0a051d7 100644 --- a/kopete/protocols/oscar/icq/icqpresence.cpp +++ b/kopete/protocols/oscar/icq/icqpresence.cpp @@ -49,7 +49,7 @@ struct PresenceTypeData static const PresenceTypeData *all(); static const PresenceTypeData &forType( Presence::Type type ); - static const PresenceTypeData &fortqStatus( unsigned long status ); + static const PresenceTypeData &forStatus( unsigned long status ); static const PresenceTypeData &forOnlineStatusType( const Kopete::OnlineStatus::StatusType statusType ); }; @@ -89,7 +89,7 @@ const PresenceTypeData &PresenceTypeData::forType( Presence::Type type ) return array[0]; } -const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status ) +const PresenceTypeData &PresenceTypeData::forStatus( unsigned long status ) { const PresenceTypeData *array = all(); for ( uint n = 0; n < Presence::TypeCount; ++n ) @@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen return d->invisibleStatusList[ presence.type() ]; } -Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus() +Kopete::OnlineStatus OnlineStatusManager::connectingStatus() { return d->connecting; } -Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus() +Kopete::OnlineStatus OnlineStatusManager::unknownStatus() { return d->unknown; } @@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const } -unsigned long Presence::toOscartqStatus() const +unsigned long Presence::toOscarStatus() const { - unsigned long basictqStatus = basicOscartqStatus(); + unsigned long basicStatus = basicOscarStatus(); if ( _visibility == Invisible ) - basictqStatus |= StatusCode::INVISIBLE; - return basictqStatus; + basicStatus |= StatusCode::INVISIBLE; + return basicStatus; } -Presence Presence::fromOscartqStatus( unsigned long code ) +Presence Presence::fromOscarStatus( unsigned long code ) { - Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE ); + Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE ); bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE; return Presence( type, invisible ? Invisible : Visible ); } -unsigned long Presence::basicOscartqStatus() const +unsigned long Presence::basicOscarStatus() const { const PresenceTypeData &data = PresenceTypeData::forType( _type ); return data.setFlag; } -Presence::Type Presence::typeFromOscartqStatus( unsigned long status ) +Presence::Type Presence::typeFromOscarStatus( unsigned long status ) { - const PresenceTypeData &data = PresenceTypeData::fortqStatus( status ); + const PresenceTypeData &data = PresenceTypeData::forStatus( status ); return data.type; } -- cgit v1.2.1