From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 22 Jun 2011 00:30:31 +0000
Subject: 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
---
 .../protocols/jabber/jingle/jinglevoicesession.cpp | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kopete/protocols/jabber/jingle/jinglevoicesession.cpp')

diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index 91fa1a77..3f3bd6ca 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-// libjingle before everything else to not clash with Qt
+// libjingle before everything else to not clash with TQt
 #define POSIX
 #include "talk/xmpp/constants.h"
 #include "talk/base/sigslot.h"
@@ -38,7 +38,7 @@
 #include "jinglevoicesession.h"
 #include "jinglesessionmanager.h"
 
-// Qt includes
+// TQt includes
 #include <tqdom.h>
 
 // KDE includes
@@ -68,14 +68,14 @@ static bool hasPeer(const JingleVoiceSession::JidList &jidList, const XMPP::Jid
 //BEGIN SlotsProxy
 /**
  * This class is used to receive signals from libjingle, 
- * which is are not compatible with Qt signals.
+ * which is are not compatible with TQt signals.
  * So it's a proxy between JingeVoiceSession(qt)<->linjingle class.
  */
 class JingleVoiceSession::SlotsProxy : public sigslot::has_slots<> 
 {
 public:
-	SlotsProxy(JingleVoiceSession *parent)
-	 : voiceSession(parent)
+	SlotsProxy(JingleVoiceSession *tqparent)
+	 : voiceSession(tqparent)
 	{}
 	
 	void OnCallCreated(cricket::Call* call)
@@ -93,7 +93,7 @@ public:
 		XMPP::Jid jid(session->remote_address().c_str());
 		
 		// Do nothing if the session do not contain a peers.
-		//if( !voiceSession->peers().contains(jid) )
+		//if( !voiceSession->peers().tqcontains(jid) )
 		if( !hasPeer(voiceSession->peers(), jid) )
 			return;
 
@@ -115,7 +115,7 @@ public:
 		{}
 		else if (state == cricket::Session::STATE_RECEIVEDMODIFY) 
 		{
-			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
+			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
 		}
 		else if (state == cricket::Session::STATE_SENTREJECT) 
 		{}
@@ -142,8 +142,8 @@ public:
 	void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza)
 	{
 		TQString irisStanza(buzzStanza->Str().c_str());
-		irisStanza.replace("cli:iq","iq");
-		irisStanza.replace(":cli=","=");
+		irisStanza.tqreplace("cli:iq","iq");
+		irisStanza.tqreplace(":cli=","=");
 	
 		voiceSession->sendStanza(irisStanza);
 	}
@@ -152,30 +152,30 @@ private:
 };
 //END SlotsProxy
 
-//BEGIN JingleIQResponder
-class JingleVoiceSession::JingleIQResponder : public XMPP::Task
+//BEGIN JingleITQResponder
+class JingleVoiceSession::JingleITQResponder : public XMPP::Task
 {
 public:
-	JingleIQResponder(XMPP::Task *);
-	~JingleIQResponder();
+	JingleITQResponder(XMPP::Task *);
+	~JingleITQResponder();
 
 	bool take(const TQDomElement &);
 };
 
 /**
- * \class JingleIQResponder
+ * \class JingleITQResponder
  * \brief A task that responds to jingle candidate queries with an empty reply.
  */
  
-JingleVoiceSession::JingleIQResponder::JingleIQResponder(Task *parent) :Task(parent)
+JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent)
 {
 }
 
-JingleVoiceSession::JingleIQResponder::~JingleIQResponder()
+JingleVoiceSession::JingleITQResponder::~JingleITQResponder()
 {
 }
 
-bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e)
+bool JingleVoiceSession::JingleITQResponder::take(const TQDomElement &e)
 {
 	if(e.tagName() != "iq")
 		return false;
@@ -189,7 +189,7 @@ bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e)
 	
 	return false;
 }
-//END JingleIQResponder
+//END JingleITQResponder
 
 class JingleVoiceSession::Private
 {
@@ -226,7 +226,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe
 	// Listen to incoming packets
 	connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&)));
 
-	new JingleIQResponder(account->client()->rootTask());
+	new JingleITQResponder(account->client()->rootTask());
 }
 
 JingleVoiceSession::~JingleVoiceSession()
-- 
cgit v1.2.1