From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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/libiris/iris/include/im.h | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'kopete/protocols/jabber/libiris/iris/include/im.h')

diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 835eed62..8387d48a 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -136,11 +136,11 @@ namespace XMPP
 		SubType value;
 	};
 
-	class Status
+	class tqStatus
 	{
 	public:
-		Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
-		~Status();
+		tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
+		~tqStatus();
 
 		int priority() const;
 		const TQString & show() const;
@@ -162,7 +162,7 @@ namespace XMPP
 
 		void setPriority(int);
 		void setShow(const TQString &);
-		void setStatus(const TQString &);
+		void settqStatus(const TQString &);
 		void setTimeStamp(const TQDateTime &);
 		void setKeyID(const TQString &);
 		void setIsAvailable(bool);
@@ -197,19 +197,19 @@ namespace XMPP
 	class Resource
 	{
 	public:
-		Resource(const TQString &name="", const Status &s=Status());
+		Resource(const TQString &name="", const tqStatus &s=tqStatus());
 		~Resource();
 
 		const TQString & name() const;
 		int priority() const;
-		const Status & status() const;
+		const tqStatus & status() const;
 
 		void setName(const TQString &);
-		void setStatus(const Status &);
+		void settqStatus(const tqStatus &);
 
 	private:
 		TQString v_name;
-		Status v_status;
+		tqStatus v_status;
 
 		class ResourcePrivate *d;
 	};
@@ -570,7 +570,7 @@ namespace XMPP
 		void rosterRequest();
 		void sendMessage(const Message &);
 		void sendSubscription(const Jid &, const TQString &);
-		void setPresence(const Status &);
+		void setPresence(const tqStatus &);
 
 		void debug(const TQString &);
 		TQString genUniqueId();
@@ -610,8 +610,8 @@ namespace XMPP
 
 		bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick);
 		bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password);
-		void groupChatSetStatus(const TQString &host, const TQString &room, const Status &);
-		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &);
+		void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &);
+		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &);
 		void groupChatLeave(const TQString &host, const TQString &room);
 
 	signals:
@@ -632,7 +632,7 @@ namespace XMPP
 		void xmlOutgoing(const TQString &);
 		void groupChatJoined(const Jid &);
 		void groupChatLeft(const Jid &);
-		void groupChatPresence(const Jid &, const Status &);
+		void groupChatPresence(const Jid &, const tqStatus &);
 		void groupChatError(const Jid &, int, const TQString &);
 
 		void incomingJidLink();
@@ -652,7 +652,7 @@ namespace XMPP
 
 		// basic daemons
 		void ppSubscription(const Jid &, const TQString &);
-		void ppPresence(const Jid &, const Status &);
+		void ppPresence(const Jid &, const tqStatus &);
 		void pmMessage(const Message &);
 		void prRoster(const Roster &);
 
@@ -666,8 +666,8 @@ namespace XMPP
 		void distribute(const TQDomElement &);
 		void importRoster(const Roster &);
 		void importRosterItem(const RosterItem &);
-		void updateSelfPresence(const Jid &, const Status &);
-		void updatePresence(LiveRosterItem *, const Jid &, const Status &);
+		void updateSelfPresence(const Jid &, const tqStatus &);
+		void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &);
 
 		class ClientPrivate;
 		ClientPrivate *d;
@@ -689,15 +689,15 @@ namespace XMPP
 		ResourceList::ConstIterator priority() const;
 
 		bool isAvailable() const;
-		const Status & lastUnavailableStatus() const;
+		const tqStatus & lastUnavailabletqStatus() const;
 		bool flagForDelete() const;
 
-		void setLastUnavailableStatus(const Status &);
+		void setLastUnavailabletqStatus(const tqStatus &);
 		void setFlagForDelete(bool);
 
 	private:
 		ResourceList v_resourceList;
-		Status v_lastUnavailableStatus;
+		tqStatus v_lastUnavailabletqStatus;
 		bool v_flagForDelete;
 
 		class LiveRosterItemPrivate;
-- 
cgit v1.2.1