TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 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 058825db..844d5e3f 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 groupChatSetStatus(const QString &host, const QString &room, const Status &);
- 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
+ 		void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &);
+ 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &);
  		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").arg(jid.full()));
++	debug(QString("Client: Joined: [%1]\n").tqarg(jid.full()));
 +	GroupChat i;
 +	i.j = jid;
 +	i.status = GroupChat::Connecting;
 +	d->groupChatList += i;
 +
 +	JT_MucPresence *j = new JT_MucPresence(rootTask());
-+	j->pres(jid, Status(), password);
++	j->pres(jid, tqStatus(), password);
 +	j->go(true);
 +
 +	return true;
 +}
 +
- void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s)
+ void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s)
  {
  	Jid jid(room + "@" + host);
 Index: iris/xmpp-im/xmpp_tasks.h
@@ -63,11 +63,11 @@ Index: iris/xmpp-im/xmpp_tasks.h
 +	{
 +		Q_OBJECT
 +	public:
-+		JT_MucPresence(Task *parent);
++		JT_MucPresence(Task *tqparent);
 +		~JT_MucPresence();
 +
-+		void pres(const Status &);
-+		void pres(const Jid &, const Status &, const QString &password);
++		void pres(const tqStatus &);
++		void pres(const Jid &, const tqStatus &, const QString &password);
 +
 +		void onGo();
 +
@@ -92,8 +92,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +//----------------------------------------------------------------------------
 +// JT_MucPresence
 +//----------------------------------------------------------------------------
-+JT_MucPresence::JT_MucPresence(Task *parent)
-+:Task(parent)
++JT_MucPresence::JT_MucPresence(Task *tqparent)
++:Task(tqparent)
 +{
 +	type = -1;
 +}
@@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +{
 +}
 +
-+void JT_MucPresence::pres(const Status &s)
++void JT_MucPresence::pres(const tqStatus &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").arg(s.priority()) ) );
++		tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(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 Status &s, const QString &password)
++void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password)
 +{
 +	pres(s);
 +	tag.setAttribute("to", to.full());