summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/icq/icqpresence.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar/icq/icqpresence.cpp')
-rw-r--r--kopete/protocols/oscar/icq/icqpresence.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp
index 393f04c9..520153a6 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 &forStatus( unsigned long status );
+ static const PresenceTypeData &fortqStatus( 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::forStatus( unsigned long status )
+const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status )
{
const PresenceTypeData *array = all();
for ( uint n = 0; n < Presence::TypeCount; ++n )
@@ -132,8 +132,8 @@ public:
, waitingForAuth( Kopete::OnlineStatus::Unknown, 1, ICQProtocol::protocol(),
Presence::Offline, "button_cancel", i18n("Waiting for Authorization") )
, invisible( Kopete::OnlineStatus::Invisible, 2, ICQProtocol::protocol(),
- Presence::Offline, TQString::null, TQString::null,
- TQString::null, Kopete::OnlineStatusManager::Invisible,
+ Presence::Offline, TQString(), TQString(),
+ TQString(), Kopete::OnlineStatusManager::Invisible,
Kopete::OnlineStatusManager::HideFromMenu )
{
@@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen
return d->invisibleStatusList[ presence.type() ];
}
-Kopete::OnlineStatus OnlineStatusManager::connectingStatus()
+Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus()
{
return d->connecting;
}
-Kopete::OnlineStatus OnlineStatusManager::unknownStatus()
+Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus()
{
return d->unknown;
}
@@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const
}
-unsigned long Presence::toOscarStatus() const
+unsigned long Presence::toOscartqStatus() const
{
- unsigned long basicStatus = basicOscarStatus();
+ unsigned long basictqStatus = basicOscartqStatus();
if ( _visibility == Invisible )
- basicStatus |= StatusCode::INVISIBLE;
- return basicStatus;
+ basictqStatus |= StatusCode::INVISIBLE;
+ return basictqStatus;
}
-Presence Presence::fromOscarStatus( unsigned long code )
+Presence Presence::fromOscartqStatus( unsigned long code )
{
- Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE );
+ Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE );
bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE;
return Presence( type, invisible ? Invisible : Visible );
}
-unsigned long Presence::basicOscarStatus() const
+unsigned long Presence::basicOscartqStatus() const
{
const PresenceTypeData &data = PresenceTypeData::forType( _type );
return data.setFlag;
}
-Presence::Type Presence::typeFromOscarStatus( unsigned long status )
+Presence::Type Presence::typeFromOscartqStatus( unsigned long status )
{
- const PresenceTypeData &data = PresenceTypeData::forStatus( status );
+ const PresenceTypeData &data = PresenceTypeData::fortqStatus( status );
return data.type;
}