summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jabberprotocol.h
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jabberprotocol.h')
-rw-r--r--kopete/protocols/jabber/jabberprotocol.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h
index 6e647f74..0e79c357 100644
--- a/kopete/protocols/jabber/jabberprotocol.h
+++ b/kopete/protocols/jabber/jabberprotocol.h
@@ -39,11 +39,11 @@
namespace XMPP
{
class Resource;
- class Status;
+ class tqStatus;
}
class JabberContact;
-class dlgJabberStatus;
+class dlgJabbertqStatus;
class dlgJabberSendRaw;
class JabberCapabilitiesManager;
@@ -95,8 +95,8 @@ public:
const Kopete::ContactPropertyTmpl propWorkPhone;
const Kopete::ContactPropertyTmpl propWorkMobilePhone;
const Kopete::ContactPropertyTmpl propNickName;
- const Kopete::ContactPropertyTmpl propSubscriptionStatus;
- const Kopete::ContactPropertyTmpl propAuthorizationStatus;
+ const Kopete::ContactPropertyTmpl propSubscriptiontqStatus;
+ const Kopete::ContactPropertyTmpl propAuthorizationtqStatus;
const Kopete::ContactPropertyTmpl propAvailableResources;
const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp;
const Kopete::ContactPropertyTmpl propPhoto;
@@ -141,9 +141,9 @@ public:
Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource );
/**
- * Convert an online status to a XMPP::Status
+ * Convert an online status to a XMPP::tqStatus
*/
- XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
+ XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
/**
* Return the Entity Capabilities(JEP-0115) manager instance.