Rename a number of old tq methods that are no longer tq specific

16 files changed, 154 insertions, 154 deletions

diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
index 4632af45..058825db 100644
--- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
+++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
@@ -7,8 +7,8 @@ Index: iris/include/im.h
  
  		bool groupChatJoin(const QString &host, const QString &room, const QString &nick);
 +		bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password);
- 		void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &);
- 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &);
+ 		void groupChatSetStatus(const QString &host, const QString &room, const Status &);
+ 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
  		void groupChatLeave(const QString &host, const QString &room);
 Index: iris/xmpp-im/client.cpp
 ===================================================================
@@ -34,20 +34,20 @@ Index: iris/xmpp-im/client.cpp
 +			++it;
 +	}
 +
-+	debug(QString("Client: Joined: [%1]\n").tqarg(jid.full()));
++	debug(QString("Client: Joined: [%1]\n").arg(jid.full()));
 +	GroupChat i;
 +	i.j = jid;
 +	i.status = GroupChat::Connecting;
 +	d->groupChatList += i;
 +
 +	JT_MucPresence *j = new JT_MucPresence(rootTask());
-+	j->pres(jid, tqStatus(), password);
++	j->pres(jid, Status(), password);
 +	j->go(true);
 +
 +	return true;
 +}
 +
- void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s)
+ void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s)
  {
  	Jid jid(room + "@" + host);
 Index: iris/xmpp-im/xmpp_tasks.h
@@ -66,8 +66,8 @@ Index: iris/xmpp-im/xmpp_tasks.h
 +		JT_MucPresence(Task *parent);
 +		~JT_MucPresence();
 +
-+		void pres(const tqStatus &);
-+		void pres(const Jid &, const tqStatus &, const QString &password);
++		void pres(const Status &);
++		void pres(const Jid &, const Status &, const QString &password);
 +
 +		void onGo();
 +
@@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +{
 +}
 +
-+void JT_MucPresence::pres(const tqStatus &s)
++void JT_MucPresence::pres(const Status &s)
 +{
 +	type = 0;
 +
@@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +		if(!s.status().isEmpty())
 +			tag.appendChild(textTag(doc(), "status", s.status()));
 +
-+		tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) );
++		tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) );
 +
 +		if(!s.keyID().isEmpty()) {
 +			QDomElement x = textTag(doc(), "x", s.keyID());
@@ -146,7 +146,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +	}
 +}
 +
-+void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password)
++void JT_MucPresence::pres(const Jid &to, const Status &s, const QString &password)
 +{
 +	pres(s);
 +	tag.setAttribute("to", to.full());
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index cd5b2f64..f20c054f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -358,7 +358,7 @@ void HttpPoll::resetKey()
 	fprintf(stderr, "HttpPoll: reset key!\n");
 #endif
 	TQByteArray a = randomArray(64);
-	TQString str = TQString::tqfromLatin1(a.data(), a.size());
+	TQString str = TQString::fromLatin1(a.data(), a.size());
 
 	d->key_n = POLL_KEYS;
 	for(int n = 0; n < POLL_KEYS; ++n)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index 16f02e07..e4e1b182 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -122,7 +122,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::tqfromLatin1(cs);
+		host = TQString::fromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
@@ -467,7 +467,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::tqfromLatin1(cs);
+		host = TQString::fromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index c9726d75..fcdd3d49 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a)
 	TQCString c;
 	c.resize(b.size()+1);
 	memcpy(c.data(), b.data(), b.size());
-	return TQString::tqfromLatin1(c);
+	return TQString::fromLatin1(c);
 }
 
 //!
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 0c8b46df..6339d14a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -20,11 +20,11 @@
 
 #include"showtextdlg.h"
 
-#include<tqlayout.h>
-#include<tqtextedit.h>
+#include<layout.h>
+#include<textedit.h>
 #include<tqpushbutton.h>
 #include<tqfile.h>
-#include<tqtextstream.h>
+#include<textstream.h>
 
 
 ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name)
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 8387d48a..835eed62 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 tqStatus
+	class Status
 	{
 	public:
-		tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
-		~tqStatus();
+		Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
+		~Status();
 
 		int priority() const;
 		const TQString & show() const;
@@ -162,7 +162,7 @@ namespace XMPP
 
 		void setPriority(int);
 		void setShow(const TQString &);
-		void settqStatus(const TQString &);
+		void setStatus(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 tqStatus &s=tqStatus());
+		Resource(const TQString &name="", const Status &s=Status());
 		~Resource();
 
 		const TQString & name() const;
 		int priority() const;
-		const tqStatus & status() const;
+		const Status & status() const;
 
 		void setName(const TQString &);
-		void settqStatus(const tqStatus &);
+		void setStatus(const Status &);
 
 	private:
 		TQString v_name;
-		tqStatus v_status;
+		Status 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 tqStatus &);
+		void setPresence(const Status &);
 
 		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 groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &);
-		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &);
+		void groupChatSetStatus(const TQString &host, const TQString &room, const Status &);
+		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &);
 		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 tqStatus &);
+		void groupChatPresence(const Jid &, const Status &);
 		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 tqStatus &);
+		void ppPresence(const Jid &, const Status &);
 		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 tqStatus &);
-		void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &);
+		void updateSelfPresence(const Jid &, const Status &);
+		void updatePresence(LiveRosterItem *, const Jid &, const Status &);
 
 		class ClientPrivate;
 		ClientPrivate *d;
@@ -689,15 +689,15 @@ namespace XMPP
 		ResourceList::ConstIterator priority() const;
 
 		bool isAvailable() const;
-		const tqStatus & lastUnavailabletqStatus() const;
+		const Status & lastUnavailableStatus() const;
 		bool flagForDelete() const;
 
-		void setLastUnavailabletqStatus(const tqStatus &);
+		void setLastUnavailableStatus(const Status &);
 		void setFlagForDelete(bool);
 
 	private:
 		ResourceList v_resourceList;
-		tqStatus v_lastUnavailabletqStatus;
+		Status v_lastUnavailableStatus;
 		bool v_flagForDelete;
 
 		class LiveRosterItemPrivate;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 3fa7d6c3..edd2398b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -49,7 +49,7 @@
 
 #include"parser.h"
 
-#include<tqtextcodec.h>
+#include<textcodec.h>
 #include<tqptrlist.h>
 #include<string.h>
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 89c98a91..f96fd795 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 		e.setAttribute("mechanism", sasl_mech);
 		if(!sasl_step.isEmpty()) {
 #ifdef XMPP_TEST
-			TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+			TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
 			e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step)));
 		}
@@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 		else {
 			TQByteArray stepData = sasl_step;
 #ifdef XMPP_TEST
-			TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+			TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
 			TQDomElement e = doc.createElementNS(NS_SASL, "response");
 			if(!stepData.isEmpty())
@@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 #ifdef XMPP_TEST
 				TQString s = "SASL mechs:";
 				for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
-					s += TQString(" [%1]").tqarg((*it));
+					s += TQString(" [%1]").arg((*it));
 				TD::msg(s);
 #endif
 			}
@@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 			if(e.tagName() == "challenge") {
 				TQByteArray a = Base64::stringToArray(e.text());
 #ifdef XMPP_TEST
-				TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a)));
+				TD::msg(TQString("SASL IN: [%1]").arg(printArray(a)));
 #endif
 				sasl_step = a;
 				need = NSASLNext;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 0e324cb1..c2f3083e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -44,7 +44,7 @@
 
 #include"xmpp.h"
 
-#include<tqtextstream.h>
+#include<textstream.h>
 #include<tqguardedptr.h>
 #include<tqtimer.h>
 #include<qca.h>
@@ -1358,9 +1358,9 @@ void ClientStream::processNext()
 #endif
 
 #ifdef XMPP_TEST
-				TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang);
+				TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang);
 				if(!d->client.from.isEmpty())
-					s += TQString(", from=[%1]").tqarg(d->client.from);
+					s += TQString(", from=[%1]").arg(d->client.from);
 				s += ')';
 				TD::msg(s);
 #endif
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index d1650842..93748aa8 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e)
 			i.setAttributeNodeNS(a);
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 973b6c73..b7d5e00c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p
 	d->pass = pass;
 	d->resource = _resource;
 
-	tqStatus stat;
+	Status stat;
 	stat.setIsAvailable(false);
 	d->resourceList += Resource(resource(), stat);
 
 	JT_PushPresence *pp = new JT_PushPresence(rootTask());
 	connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &)));
-	connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &)));
+	connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &)));
 
 	JT_PushMessage *pm = new JT_PushMessage(rootTask());
 	connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &)));
@@ -267,7 +267,7 @@ bool Client::isActive() const
 	return d->active;
 }
 
-void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s)
+void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s)
 {
 	Jid jid(room + "@" + host + "/" + nick);
 	for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con
 		if(i.j.compare(jid, false)) {
 			i.j = jid;
 
-			tqStatus s = _s;
+			Status s = _s;
 			s.setIsAvailable(true);
 
 			JT_Presence *j = new JT_Presence(rootTask());
@@ -303,14 +303,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
 			++it;
 	}
 
-	debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+	debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
 	GroupChat i;
 	i.j = jid;
 	i.status = GroupChat::Connecting;
 	d->groupChatList += i;
 
 	JT_Presence *j = new JT_Presence(rootTask());
-	j->pres(jid, tqStatus());
+	j->pres(jid, Status());
 	j->go(true);
 
 	return true;
@@ -332,20 +332,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
 			++it;
 	}
 
-	debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+	debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
 	GroupChat i;
 	i.j = jid;
 	i.status = GroupChat::Connecting;
 	d->groupChatList += i;
 
 	JT_MucPresence *j = new JT_MucPresence(rootTask());
-	j->pres(jid, tqStatus(), password);
+	j->pres(jid, Status(), password);
 	j->go(true);
 
 	return true;
 }
 
-void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s)
+void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s)
 {
 	Jid jid(room + "@" + host);
 	bool found = false;
@@ -360,7 +360,7 @@ void Client::groupChatSettqStatus(const TQString &host, const TQString &room, co
 	if(!found)
 		return;
 
-	tqStatus s = _s;
+	Status s = _s;
 	s.setIsAvailable(true);
 
 	JT_Presence *j = new JT_Presence(rootTask());
@@ -378,10 +378,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room)
 			continue;
 
 		i.status = GroupChat::Closing;
-		debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full()));
+		debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full()));
 
 		JT_Presence *j = new JT_Presence(rootTask());
-		tqStatus s;
+		Status s;
 		s.setIsAvailable(false);
 		j->pres(i.j, s);
 		j->go(true);
@@ -410,7 +410,7 @@ void Client::close(bool)
 				i.status = GroupChat::Closing;
 
 				JT_Presence *j = new JT_Presence(rootTask());
-				tqStatus s;
+				Status s;
 				s.setIsAvailable(false);
 				j->pres(i.j, s);
 				j->go(true);
@@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
 	if(!noShowNS)
 		i.setAttribute("xmlns", e.namespaceURI());
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -514,7 +514,7 @@ void Client::streamReadyRead()
 		Stanza s = d->stream->read();
 
 		TQString out = s.toString();
-		debug(TQString("Client: incoming: [\n%1]\n").tqarg(out));
+		debug(TQString("Client: incoming: [\n%1]\n").arg(out));
 		xmlIncoming(out);
 
 		TQDomElement x = oldStyleNS(s.element());
@@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 			i.setAttributeNodeNS(a.cloneNode().toAttr());
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x)
 	//x.save(ts, 0);
 
 	//TQString out = Stream::xmlToString(x);
-	//debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+	//debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
 	//xmlOutgoing(out);
 
 	TQDomElement e = addCorrectNS(x);
@@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x)
 	}
 
 	TQString out = s.toString();
-	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+	debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
 	xmlOutgoing(out);
 
 	//printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1());
@@ -654,7 +654,7 @@ void Client::send(const TQString &str)
 	if(!d->stream)
 		return;
 
-	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str));
+	debug(TQString("Client: outgoing: [\n%1]\n").arg(str));
 	xmlOutgoing(str);
 	static_cast<ClientStream*>(d->stream)->writeDirect(str);
 }
@@ -713,12 +713,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s)
 	subscription(j, s);
 }
 
-void Client::ppPresence(const Jid &j, const tqStatus &s)
+void Client::ppPresence(const Jid &j, const Status &s)
 {
 	if(s.isAvailable())
-		debug(TQString("Client: %1 is available.\n").tqarg(j.full()));
+		debug(TQString("Client: %1 is available.\n").arg(j.full()));
 	else
-		debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full()));
+		debug(TQString("Client: %1 is unavailable.\n").arg(j.full()));
 
 	for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
 		GroupChat &i = *it;
@@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
 		if(i.j.compare(j, false)) {
 			bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false;
 
-			debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us));
+			debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us));
 			switch(i.status) {
 				case GroupChat::Connecting:
 					if(us && s.hasError()) {
@@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
 	}
 }
 
-void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
+void Client::updateSelfPresence(const Jid &j, const Status &s)
 {
 	ResourceList::Iterator rit = d->resourceList.find(j.resource());
 	bool found = (rit == d->resourceList.end()) ? false: true;
@@ -797,8 +797,8 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 	// unavailable?  remove the resource
 	if(!s.isAvailable()) {
 		if(found) {
-			debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource()));
-			(*rit).settqStatus(s);
+			debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource()));
+			(*rit).setStatus(s);
 			resourceUnavailable(j, *rit);
 			d->resourceList.remove(rit);
 		}
@@ -809,19 +809,19 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 		if(!found) {
 			r = Resource(j.resource(), s);
 			d->resourceList += r;
-			debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource()));
+			debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource()));
 		}
 		else {
-			(*rit).settqStatus(s);
+			(*rit).setStatus(s);
 			r = *rit;
-			debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource()));
+			debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource()));
 		}
 
 		resourceAvailable(j, r);
 	}
 }
 
-void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
+void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
 {
 	ResourceList::Iterator rit = i->resourceList().find(j.resource());
 	bool found = (rit == i->resourceList().end()) ? false: true;
@@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 	// unavailable?  remove the resource
 	if(!s.isAvailable()) {
 		if(found) {
-			(*rit).settqStatus(s);
-			debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			(*rit).setStatus(s);
+			debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 			resourceUnavailable(j, *rit);
 			i->resourceList().remove(rit);
-			i->setLastUnavailabletqStatus(s);
+			i->setLastUnavailableStatus(s);
 		}
 	}
 	// available?  add/update the resource
@@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 		if(!found) {
 			r = Resource(j.resource(), s);
 			i->resourceList() += r;
-			debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 		}
 		else {
-			(*rit).settqStatus(s);
+			(*rit).setStatus(s);
 			r = *rit;
-			debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 		}
 
 		resourceAvailable(j, r);
@@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 
 void Client::pmMessage(const Message &m)
 {
-	debug(TQString("Client: Message from %1\n").tqarg(m.from().full()));
+	debug(TQString("Client: Message from %1\n").arg(m.from().full()));
 
 	if(m.type() == "groupchat") {
 		for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type)
 	j->go(true);
 }
 
-void Client::setPresence(const tqStatus &s)
+void Client::setPresence(const Status &s)
 {
 	JT_Presence *j = new JT_Presence(rootTask());
 	j->pres(s);
@@ -1004,7 +1004,7 @@ void Client::setPresence(const tqStatus &s)
 	ppPresence(jid(), s);
 	//ResourceList::Iterator rit = d->resourceList.find(resource());
 	//Resource &r = *rit;
-	//r.settqStatus(s);
+	//r.setStatus(s);
 }
 
 TQString Client::OSName() const
@@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...)
 
 void Task::debug(const TQString &str)
 {
-	client()->debug(TQString("%1: ").tqarg(className()) + str);
+	client()->debug(TQString("%1: ").arg(className()) + str);
 }
 
 bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns)
@@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const
 	return false;
 }
 
-const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const
+const Status & LiveRosterItem::lastUnavailableStatus() const
 {
-	return v_lastUnavailabletqStatus;
+	return v_lastUnavailableStatus;
 }
 
 bool LiveRosterItem::flagForDelete() const
@@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const
 	return v_flagForDelete;
 }
 
-void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s)
+void LiveRosterItem::setLastUnavailableStatus(const Status &s)
 {
-	v_lastUnavailabletqStatus = s;
+	v_lastUnavailableStatus = s;
 }
 
 void LiveRosterItem::setFlagForDelete(bool b)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 9e742d10..f33e428f 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -295,7 +295,7 @@ Stanza::Error Message::error() const
 	return d->error;
 }
 
-//! \brief Set tqreceivers information
+//! \brief Set receivers information
 //!
 //! \param to - Receivers Jabber id
 void Message::setTo(const Jid &j)
@@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 		d->spooled = true;
 	}
 	else {
-		d->timeStamp = TQDateTime::tqcurrentDateTime();
+		d->timeStamp = TQDateTime::currentDateTime();
 		d->spooled = false;
 	}
 
@@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s)
 
 
 //---------------------------------------------------------------------------
-// tqStatus
+// Status
 //---------------------------------------------------------------------------
-tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available)
+Status::Status(const TQString &show, const TQString &status, int priority, bool available)
 {
 	v_isAvailable = available;
 	v_show = show;
 	v_status = status;
 	v_priority = priority;
-	v_timeStamp = TQDateTime::tqcurrentDateTime();
+	v_timeStamp = TQDateTime::currentDateTime();
 	v_isInvisible = false;
 	ecode = -1;
 }
 
-tqStatus::~tqStatus()
+Status::~Status()
 {
 }
 
-bool tqStatus::hasError() const
+bool Status::hasError() const
 {
 	return (ecode != -1);
 }
 
-void tqStatus::setError(int code, const TQString &str)
+void Status::setError(int code, const TQString &str)
 {
 	ecode = code;
 	estr = str;
 }
 
-void tqStatus::setIsAvailable(bool available)
+void Status::setIsAvailable(bool available)
 {
 	v_isAvailable = available;
 }
 
-void tqStatus::setIsInvisible(bool invisible)
+void Status::setIsInvisible(bool invisible)
 {
 	v_isInvisible = invisible;
 }
 
-void tqStatus::setPriority(int x)
+void Status::setPriority(int x)
 {
 	v_priority = x;
 }
 
-void tqStatus::setShow(const TQString & _show)
+void Status::setShow(const TQString & _show)
 {
 	v_show = _show;
 }
 
-void tqStatus::settqStatus(const TQString & _status)
+void Status::setStatus(const TQString & _status)
 {
 	v_status = _status;
 }
 
-void tqStatus::setTimeStamp(const TQDateTime & _timestamp)
+void Status::setTimeStamp(const TQDateTime & _timestamp)
 {
 	v_timeStamp = _timestamp;
 }
 
-void tqStatus::setKeyID(const TQString &key)
+void Status::setKeyID(const TQString &key)
 {
 	v_key = key;
 }
 
-void tqStatus::setXSigned(const TQString &s)
+void Status::setXSigned(const TQString &s)
 {
 	v_xsigned = s;
 }
 
-void tqStatus::setSongTitle(const TQString & _songtitle)
+void Status::setSongTitle(const TQString & _songtitle)
 {
 	v_songTitle = _songtitle;
 }
 
-void tqStatus::setCapsNode(const TQString & _capsNode)
+void Status::setCapsNode(const TQString & _capsNode)
 {
 	v_capsNode = _capsNode;
 }
 
-void tqStatus::setCapsVersion(const TQString & _capsVersion)
+void Status::setCapsVersion(const TQString & _capsVersion)
 {
 	v_capsVersion = _capsVersion;
 }
 
-void tqStatus::setCapsExt(const TQString & _capsExt)
+void Status::setCapsExt(const TQString & _capsExt)
 {
 	v_capsExt = _capsExt;
 }
 
-bool tqStatus::isAvailable() const
+bool Status::isAvailable() const
 {
 	return v_isAvailable;
 }
 
-bool tqStatus::isAway() const
+bool Status::isAway() const
 {
 	if(v_show == "away" || v_show == "xa" || v_show == "dnd")
 		return true;
@@ -902,66 +902,66 @@ bool tqStatus::isAway() const
 	return false;
 }
 
-bool tqStatus::isInvisible() const
+bool Status::isInvisible() const
 {
 	return v_isInvisible;
 }
 
-int tqStatus::priority() const
+int Status::priority() const
 {
 	return v_priority;
 }
 
-const TQString & tqStatus::show() const
+const TQString & Status::show() const
 {
 	return v_show;
 }
-const TQString & tqStatus::status() const
+const TQString & Status::status() const
 {
 	return v_status;
 }
 
-TQDateTime tqStatus::timeStamp() const
+TQDateTime Status::timeStamp() const
 {
 	return v_timeStamp;
 }
 
-const TQString & tqStatus::keyID() const
+const TQString & Status::keyID() const
 {
 	return v_key;
 }
 
-const TQString & tqStatus::xsigned() const
+const TQString & Status::xsigned() const
 {
 	return v_xsigned;
 }
 
-const TQString & tqStatus::songTitle() const
+const TQString & Status::songTitle() const
 {
 	return v_songTitle;
 }
 
-const TQString & tqStatus::capsNode() const
+const TQString & Status::capsNode() const
 {
 	return v_capsNode;
 }
 
-const TQString & tqStatus::capsVersion() const
+const TQString & Status::capsVersion() const
 {
 	return v_capsVersion;
 }
 
-const TQString & tqStatus::capsExt() const
+const TQString & Status::capsExt() const
 {
 	return v_capsExt;
 }
 
-int tqStatus::errorCode() const
+int Status::errorCode() const
 {
 	return ecode;
 }
 
-const TQString & tqStatus::errorString() const
+const TQString & Status::errorString() const
 {
 	return estr;
 }
@@ -970,7 +970,7 @@ const TQString & tqStatus::errorString() const
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const TQString &name, const tqStatus &stat)
+Resource::Resource(const TQString &name, const Status &stat)
 {
 	v_name = name;
 	v_status = stat;
@@ -990,7 +990,7 @@ int Resource::priority() const
 	return v_status.priority();
 }
 
-const tqStatus & Resource::status() const
+const Status & Resource::status() const
 {
 	return v_status;
 }
@@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name)
 	v_name = _name;
 }
 
-void Resource::settqStatus(const tqStatus & _status)
+void Resource::setStatus(const Status & _status)
 {
 	v_status = _status;
 }
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 89d66796..edc8762e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -485,7 +485,7 @@ JT_Presence::~JT_Presence()
 {
 }
 
-void JT_Presence::pres(const tqStatus &s)
+void JT_Presence::pres(const Status &s)
 {
 	type = 0;
 
@@ -504,7 +504,7 @@ void JT_Presence::pres(const tqStatus &s)
 		if(!s.status().isEmpty())
 			tag.appendChild(textTag(doc(), "status", s.status()));
 
-		tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+		tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
 
 		if(!s.keyID().isEmpty()) {
 			TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -529,7 +529,7 @@ void JT_Presence::pres(const tqStatus &s)
 	}
 }
 
-void JT_Presence::pres(const Jid &to, const tqStatus &s)
+void JT_Presence::pres(const Jid &to, const Status &s)
 {
 	pres(s);
 	tag.setAttribute("to", to.full());
@@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
 		return false;
 
 	Jid j(e.attribute("from"));
-	tqStatus p;
+	Status p;
 
 	if(e.hasAttribute("type")) {
 		TQString type = e.attribute("type");
@@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
 
 	tag = findSubTag(e, "status", &found);
 	if(found)
-		p.settqStatus(tagContent(tag));
+		p.setStatus(tagContent(tag));
 	tag = findSubTag(e, "show", &found);
 	if(found)
 		p.setShow(tagContent(tag));
@@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
 	if(!noShowNS)
 		i.setAttribute("xmlns", e.namespaceURI());
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 			i.setAttributeNodeNS(al.item(x).cloneNode().toAttr());
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -1338,12 +1338,12 @@ bool JT_ServInfo::take(const TQDomElement &e)
 	//	TQDomElement query = doc()->createElement("query");
 	//	query.setAttribute("xmlns", "jabber:iq:time");
 	//	iq.appendChild(query);
-	//	TQDateTime local = TQDateTime::tqcurrentDateTime();
+	//	TQDateTime local = TQDateTime::currentDateTime();
 	//	TQDateTime utc = local.addSecs(-getTZOffset() * 3600);
 	//	TQString str = getTZString();
 	//	query.appendChild(textTag("utc", TS2stamp(utc)));
 	//	query.appendChild(textTag("tz", str));
-	//	query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str)));
+	//	query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str)));
 	//	send(iq);
 	//	return TRUE;
 	//}
@@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence()
 {
 }
 
-void JT_MucPresence::pres(const tqStatus &s)
+void JT_MucPresence::pres(const Status &s)
 {
 	type = 0;
 
@@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const tqStatus &s)
 		if(!s.status().isEmpty())
 			tag.appendChild(textTag(doc(), "status", s.status()));
 
-		tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+		tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
 
 		if(!s.keyID().isEmpty()) {
 			TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const tqStatus &s)
 	}
 }
 
-void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password)
+void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password)
 {
 	pres(s);
 	tag.setAttribute("to", to.full());
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 9a8041e9..0a1fdac5 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -30,7 +30,7 @@
 namespace XMPP
 {
 	class Roster;
-	class tqStatus;
+	class Status;
 
 	class JT_Register : public Task
 	{
@@ -135,8 +135,8 @@ namespace XMPP
 		JT_Presence(Task *parent);
 		~JT_Presence();
 
-		void pres(const tqStatus &);
-		void pres(const Jid &, const tqStatus &);
+		void pres(const Status &);
+		void pres(const Jid &, const Status &);
 		void sub(const Jid &, const TQString &subType);
 
 		void onGo();
@@ -160,7 +160,7 @@ namespace XMPP
 		bool take(const TQDomElement &);
 
 	signals:
-		void presence(const Jid &, const tqStatus &);
+		void presence(const Jid &, const Status &);
 		void subscription(const Jid &, const TQString &);
 
 	private:
@@ -468,8 +468,8 @@ namespace XMPP
 		JT_MucPresence(Task *parent);
 		~JT_MucPresence();
 
-		void pres(const tqStatus &);
-		void pres(const Jid &, const tqStatus &, const TQString &password);
+		void pres(const Status &);
+		void pres(const Jid &, const Status &, const TQString &password);
 
 		void onGo();
 
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 489afab4..41acad0e 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp
  	v_songTitle = _songtitle;
  }
  
-+void tqStatus::setCapsNode(const QString & _capsNode)
++void Status::setCapsNode(const QString & _capsNode)
 +{
 +	v_capsNode = _capsNode;
 +}
 +
-+void tqStatus::setCapsVersion(const QString & _capsVersion)
++void Status::setCapsVersion(const QString & _capsVersion)
 +{
 +	v_capsVersion = _capsVersion;
 +}
 +
-+void tqStatus::setCapsExt(const QString & _capsExt)
++void Status::setCapsExt(const QString & _capsExt)
 +{
 +	v_capsExt = _capsExt;
 +}
 +
- bool tqStatus::isAvailable() const
+ bool Status::isAvailable() const
  {
  	return v_isAvailable;
 @@ -836,6 +851,21 @@
  	return v_songTitle;
  }
  
-+const QString & tqStatus::capsNode() const
++const QString & Status::capsNode() const
 +{
 +	return v_capsNode;
 +}
 +
-+const QString & tqStatus::capsVersion() const
++const QString & Status::capsVersion() const
 +{
 +	return v_capsVersion;
 +}
 +
-+const QString & tqStatus::capsExt() const
++const QString & Status::capsExt() const
 +{
 +	return v_capsExt;
 +}
 +
- int tqStatus::errorCode() const
+ int Status::errorCode() const
  {
  	return ecode;
 @@ -1427,6 +1457,15 @@
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
index 1996b103..bad05fcd 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::tqfromLatin1(cs);
+	return TQString::fromLatin1(cs);
 }
 
 bool RSAKey::fromPEM(const TQString &str)
@@ -794,7 +794,7 @@ TQString Cert::toPEM() const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::tqfromLatin1(cs);
+	return TQString::fromLatin1(cs);
 }
 
 bool Cert::fromPEM(const TQString &str)