Remove additional unneeded tq method conversions

9 files changed, 26 insertions, 26 deletions

diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
index 4208e0d8..f6911a3b 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
@@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call)
 	qDebug("JingleClientSlots: Call destroyed");
 	Jid jid(call->sessions()[0]->remote_address().c_str());
 	if (voiceCaller_->calling(jid)) {
-		qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full()));
+		qDebug(TQString("Removing unterminated call to %1").arg(jid.full()));
 		voiceCaller_->removeCall(jid);
 		emit voiceCaller_->terminated(jid);
 	}
@@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling()
 
 void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) 
 {
-	qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state));
+	qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state));
 	// Why is c_str() stuff needed to make it compile on OS X ?
 	Jid jid(session->remote_address().c_str());
 
@@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess
 	}
 	else if (state == cricket::Session::STATE_SENTMODIFY) { }
 	else if (state == cricket::Session::STATE_RECEIVEDMODIFY) {
-		qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+		qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
 	}
 	else if (state == cricket::Session::STATE_SENTREJECT) { }
 	else if (state == cricket::Session::STATE_RECEIVEDREJECT) {
@@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize()
 		return;
 
 	TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full();
-	qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid));
+	qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid));
 	if (jid.isEmpty()) {
 		qWarning("jinglevoicecaller.cpp: Empty JID");
 		return;
@@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid)
 
 void JingleVoiceCaller::call(const Jid& jid)
 {
-	qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full()));
+	qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full()));
 	cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall();
 	c->InitiateSession(buzz::Jid(jid.full().ascii()));
 	phone_client_->SetFocus(c);
@@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j)
 
 void JingleVoiceCaller::terminate(const Jid& j)
 {
-	qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full()));
+	qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full()));
 	cricket::Call* call = calls_[j.full()];
 	if (call != NULL) {
 		call->Terminate();
@@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call)
 
 void JingleVoiceCaller::removeCall(const Jid& j)
 {
-	qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full()));
+	qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full()));
 	calls_.remove(j.full());
 }
 
@@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza)
 	
 	// Spread the word
 	if (ok) {
-		qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza));
+		qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza));
 		buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii());
 		phone_client_->OnIncomingStanza(e);
 	}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index c5bc775d..daa0d7c0 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -115,7 +115,7 @@ public:
 		{}
 		else if (state == cricket::Session::STATE_RECEIVEDMODIFY) 
 		{
-			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
 		}
 		else if (state == cricket::Session::STATE_SENTREJECT) 
 		{}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index 446d1d41..86fc606f 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -44,7 +44,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
  : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming)
 {
 	TQString contactJid = m_peerJid.full();
-	setCaption( i18n("Voice session with %1").tqarg(contactJid) );
+	setCaption( i18n("Voice session with %1").arg(contactJid) );
 
 	connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked()));
 	connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked()));
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 6d85cb0d..a5a94941 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -194,12 +194,12 @@ int Task::Process(int state) {
 
 void
 Task::AddChild(Task * child) {
-  tqchildren_.insert(child);
+  children_.insert(child);
 }
 
 bool
 Task::AllChildrenDone() {
-  for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) {
+  for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) {
     if (!(*it)->IsDone())
       return false;
   }
@@ -213,8 +213,8 @@ Task::AnyChildError() {
 
 void
 Task::AbortAllChildren() {
-  if (tqchildren_.size() > 0) {
-    ChildSet copy = tqchildren_;
+  if (children_.size() > 0) {
+    ChildSet copy = children_;
     for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) {
       (*it)->Abort(true); // Note we do not wake
     }
@@ -231,7 +231,7 @@ void
 Task::OnChildStopped(Task * child) {
   if (child->HasError())
     child_error_ = true;
-  tqchildren_.erase(child);
+  children_.erase(child);
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 7140b691..5a486198 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -61,13 +61,13 @@
 // might be working on something as you send it infomration, you may want
 // to have a queue in the task.
 // 
-// (3) Finally it helps manage parent tasks and tqchildren.  If a parent
-// task gets aborted, all the tqchildren tasks are too.  The nice thing
+// (3) Finally it helps manage parent tasks and children.  If a parent
+// task gets aborted, all the children tasks are too.  The nice thing
 // about this, for example, is if you have one parent task that
 // represents, say, and Xmpp connection, then you can spawn a whole bunch
 // of infinite lifetime child tasks and now worry about cleaning them up.
 //  When the parent task goes to STATE_DONE, the task engine will make
-// sure all those tqchildren are aborted and get deleted.
+// sure all those children are aborted and get deleted.
 // 
 // Notice that Task has a few built-in states, e.g.,
 // 
@@ -122,7 +122,7 @@ public:
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
   
-  // For managing tqchildren
+  // For managing children
   bool AllChildrenDone();
   bool AnyChildError();
 
@@ -153,7 +153,7 @@ protected:
   virtual int ProcessStart() = 0;
   virtual int ProcessResponse() { return STATE_DONE; }
 
-  // for managing tqchildren (if any)
+  // for managing children (if any)
   void AddChild(Task * child);
   void AbortAllChildren();
 
@@ -172,9 +172,9 @@ private:
   bool child_error_;
   unsigned long long start_time_;
 
-  // for managing tqchildren
+  // for managing children
   typedef std::set<Task *> ChildSet;
-  ChildSet tqchildren_;
+  ChildSet children_;
   
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
index 43728eb7..b5ecc55e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
@@ -33,7 +33,7 @@
 namespace buzz {
 
 TaskRunner::~TaskRunner() {
-  // this kills and deletes tqchildren silently!
+  // this kills and deletes children silently!
   AbortAllChildren();
   RunTasks();
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
index a021f67a..08ccd288 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
@@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) :
   }
   pLastAttr_ = newAttr;
 
-  // copy tqchildren
+  // copy children
   XmlChild * pChild;
   XmlChild ** ppLast = &pFirstChild_;
   XmlChild * newChild = NULL;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
index 8e36ac02..e0d2c006 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
@@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) {
     i += 2;
   }
 
-  // now the tqchildren
+  // now the children
   const XmlChild * pchild = element->FirstChild();
 
   if (pchild == NULL)
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
index 7987856e..cdcfa9e7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -223,7 +223,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
     error_element.AddAttr(name, attribute->Value());
   }
 
-  // copy tqchildren
+  // copy children
   for (const XmlChild * child = element_original->FirstChild();
        child;
        child = child->NextChild()) {