From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/protocols/jabber/jabberaccount.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kopete/protocols/jabber/jabberaccount.h') diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 9ce7c9c4..17286a90 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -147,7 +147,7 @@ public slots: void disconnect ( Kopete::Account::DisconnectReason reason ); /* Disconnect with a reason, and status */ - void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ); + void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ); /* Reimplemented from Kopete::Account */ void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); @@ -199,13 +199,13 @@ private: void cleanup (); /* Initial presence to set after connecting. */ - XMPP::Status m_initialPresence; + XMPP::tqStatus m_initialPresence; /** * Sets our own presence. Updates our resource in the * resource pool and sends a presence packet to the server. */ - void setPresence ( const XMPP::Status &status ); + void setPresence ( const XMPP::tqStatus &status ); /** * Returns if a connection attempt is currently in progress. @@ -257,7 +257,7 @@ private slots: void slotJoinNewChat (); void slotGroupChatJoined ( const XMPP::Jid &jid ); void slotGroupChatLeft ( const XMPP::Jid &jid ); - void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); + void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); void slotGroupChatError ( const XMPP::Jid &jid, int error, const TQString &reason ); /* Incoming subscription request. */ -- cgit v1.2.1