summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/icq/icqpresence.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
commit83677e35509b4dafac63b76995652bdf3b49f209 (patch)
tree591f1dc22278addb439726c42896376b17bb42bd /kopete/protocols/oscar/icq/icqpresence.h
parent808e453c56036211f57482ed847d54aca01bba68 (diff)
downloadtdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz
tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/protocols/oscar/icq/icqpresence.h')
-rw-r--r--kopete/protocols/oscar/icq/icqpresence.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/oscar/icq/icqpresence.h b/kopete/protocols/oscar/icq/icqpresence.h
index d7ef9ed2..360cadeb 100644
--- a/kopete/protocols/oscar/icq/icqpresence.h
+++ b/kopete/protocols/oscar/icq/icqpresence.h
@@ -78,8 +78,8 @@ public:
~OnlineStatusManager();
ICQ::Presence presenceOf( uint internalStatus );
Kopete::OnlineStatus onlineStatusOf( const ICQ::Presence &presence );
- Kopete::OnlineStatus connectingStatus();
- Kopete::OnlineStatus unknownStatus();
+ Kopete::OnlineStatus connectingtqStatus();
+ Kopete::OnlineStatus unknowntqStatus();
Kopete::OnlineStatus waitingForAuth();
private:
@@ -117,23 +117,23 @@ public:
Kopete::OnlineStatus toOnlineStatus() const;
/**
- * Get the status code to pass to liboscar to set us to this Status.
+ * Get the status code to pass to liboscar to set us to this tqStatus.
* @note This is not the opposite of fromOnlineStatus(). The set and get codes don't match.
*/
- unsigned long toOscarStatus() const;
+ unsigned long toOscartqStatus() const;
/**
* Get the status a contact is at based on liboscar's view of its status.
* @note This is not the opposite of toOnlineStatus().
*/
- static Presence fromOscarStatus( unsigned long code );
+ static Presence fromOscartqStatus( unsigned long code );
bool operator==( const Presence &other ) const { return other._type == _type && other._visibility == _visibility; }
bool operator!=( const Presence &other ) const { return !(*this == other); }
private:
- unsigned long basicOscarStatus() const;
- static Type typeFromOscarStatus( unsigned long status );
+ unsigned long basicOscartqStatus() const;
+ static Type typeFromOscartqStatus( unsigned long status );
private:
Type _type;
Visibility _visibility;