Rename old tq methods that no longer need a unique name

19 files changed, 144 insertions, 144 deletions

diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index a389730b..446d1d41 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -69,7 +69,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
 		setContactInformation( peerContact );
 	}
 	
-	labelSessiontqStatus->setText( i18n("Incoming Session...") );
+	labelSessionStatus->setText( i18n("Incoming Session...") );
 	buttonAccept->setEnabled(true);
 	buttonDecline->setEnabled(true);
 }
@@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact)
 
 void JingleVoiceSessionDialog::start()
 {
-	labelSessiontqStatus->setText( i18n("Waiting for other peer...") );
+	labelSessionStatus->setText( i18n("Waiting for other peer...") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(true);
@@ -106,7 +106,7 @@ void JingleVoiceSessionDialog::start()
 
 void JingleVoiceSessionDialog::slotAcceptClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session accepted.") );
+	labelSessionStatus->setText( i18n("Session accepted.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(true);
@@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked()
 
 void JingleVoiceSessionDialog::slotDeclineClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session declined.") );
+	labelSessionStatus->setText( i18n("Session declined.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(false);
@@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked()
 
 void JingleVoiceSessionDialog::slotTerminateClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session terminated.") );
+	labelSessionStatus->setText( i18n("Session terminated.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(false);
@@ -147,7 +147,7 @@ void JingleVoiceSessionDialog::sessionStarted(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session in progress.") );
+		labelSessionStatus->setText( i18n("Session in progress.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(true);
@@ -159,7 +159,7 @@ void JingleVoiceSessionDialog::sessionAccepted(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session accepted.") );
+		labelSessionStatus->setText( i18n("Session accepted.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(true);
@@ -171,7 +171,7 @@ void JingleVoiceSessionDialog::sessionDeclined(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session declined.") );
+		labelSessionStatus->setText( i18n("Session declined.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(false);
@@ -183,7 +183,7 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session terminated.") );
+		labelSessionStatus->setText( i18n("Session terminated.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(false);
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index 72e3827c..3ae2edc1 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -45,7 +45,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -70,7 +70,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -97,7 +97,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -116,7 +116,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>128</width>
                                     <height>128</height>
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -188,7 +188,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -209,7 +209,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -248,7 +248,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -298,7 +298,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -325,7 +325,7 @@
                 </widget>
                 <widget class="TQLabel">
                     <property name="name">
-                        <cstring>labelSessiontqStatus</cstring>
+                        <cstring>labelSessionStatus</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -351,7 +351,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
index 40c1fbfe..6d818932 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
@@ -188,13 +188,13 @@ private:
   CallClient* call_client_;
 };
 
-const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) {
+const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) {
   switch (show) {
-  case buzz::tqStatus::SHOW_XA:      return desc.c_str();
-  case buzz::tqStatus::SHOW_ONLINE:  return "online";
-  case buzz::tqStatus::SHOW_AWAY:    return "away";
-  case buzz::tqStatus::SHOW_DND:     return "do not disturb";
-  case buzz::tqStatus::SHOW_CHAT:    return "ready to chat";
+  case buzz::Status::SHOW_XA:      return desc.c_str();
+  case buzz::Status::SHOW_ONLINE:  return "online";
+  case buzz::Status::SHOW_AWAY:    return "away";
+  case buzz::Status::SHOW_DND:     return "do not disturb";
+  case buzz::Status::SHOW_CHAT:    return "ready to chat";
   delault:                         return "offline";
   }
 }
@@ -320,11 +320,11 @@ void CallClient::InitPresence() {
     this, &CallClient::OnStatusUpdate);
   presence_push_->Start();
 
-  buzz::tqStatus my_status;
+  buzz::Status my_status;
   my_status.set_jid(xmpp_client_->jid());
   my_status.set_available(true);
   my_status.set_invisible(false);
-  my_status.set_show(buzz::tqStatus::SHOW_ONLINE);
+  my_status.set_show(buzz::Status::SHOW_ONLINE);
   my_status.set_priority(0);
   my_status.set_know_capabilities(true);
   my_status.set_phone_capability(true);
@@ -337,7 +337,7 @@ void CallClient::InitPresence() {
   presence_out_->Start();
 }
 
-void CallClient::OnStatusUpdate(const buzz::tqStatus& status) {
+void CallClient::OnStatusUpdate(const buzz::Status& status) {
   RosterItem item;
   item.jid = status.jid();
   item.show = status.show();
@@ -362,7 +362,7 @@ void CallClient::PrintRoster() {
   while (iter != roster_->end()) {
     Console()->Printf("%s - %s",
                       iter->second.jid.BareJid().Str().c_str(),
-                      DescribetqStatus(iter->second.show, iter->second.status));
+                      DescribeStatus(iter->second.show, iter->second.status));
     iter++;
   }
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
index 24ce1545..d35a6114 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
@@ -29,7 +29,7 @@
 
 namespace buzz {
 class PresencePushTask;
-class tqStatus;
+class Status;
 }
 
 namespace cricket {
@@ -43,7 +43,7 @@ class Call;
 
 struct RosterItem {
   buzz::Jid jid;
-  buzz::tqStatus::Show show;
+  buzz::Status::Show show;
   std::string status;
 };
 
@@ -82,7 +82,7 @@ private:
   void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza);
 
   void InitPresence();
-  void OnStatusUpdate(const buzz::tqStatus& status);
+  void OnStatusUpdate(const buzz::Status& status);
 };
 
 #endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
index 7fd68120..a15a6c83 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
@@ -42,27 +42,27 @@ bool ToString(const T &t,
   return !oss.fail();
 }
 
-XmppReturntqStatus
-PresenceOutTask::Send(const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::Send(const Status & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  stanza_.reset(TranslatetqStatus(s));
+  stanza_.reset(TranslateStatus(s));
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
-PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::SendDirected(const Jid & j, const Status & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  XmlElement * presence = TranslatetqStatus(s);
+  XmlElement * presence = TranslateStatus(s);
   presence->AddAttr(TQN_TO, j.Str());
   stanza_.reset(presence);
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) {
+XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
@@ -82,7 +82,7 @@ PresenceOutTask::ProcessStart() {
 }
 
 XmlElement *
-PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
+PresenceOutTask::TranslateStatus(const Status & s) {
   XmlElement * result = new XmlElement(TQN_PRESENCE);
   if (!s.available()) {
     result->AddAttr(TQN_TYPE, STR_UNAVAILABLE);
@@ -92,19 +92,19 @@ PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
       result->AddAttr(TQN_TYPE, STR_INVISIBLE);
     }
 
-    if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) {
+    if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) {
       result->AddElement(new XmlElement(TQN_SHOW));
       switch (s.show()) {
         default:
           result->AddText(STR_SHOW_AWAY, 1);
           break;
-        case tqStatus::SHOW_XA:
+        case Status::SHOW_XA:
           result->AddText(STR_SHOW_XA, 1);
           break;
-        case tqStatus::SHOW_DND:
+        case Status::SHOW_DND:
           result->AddText(STR_SHOW_DND, 1);
           break;
-        case tqStatus::SHOW_CHAT:
+        case Status::SHOW_CHAT:
           result->AddText(STR_SHOW_CHAT, 1);
           break;
       }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
index 47660514..2b65a553 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
@@ -31,13 +31,13 @@ public:
   PresenceOutTask(Task * parent) : XmppTask(parent) {}
   virtual ~PresenceOutTask() {}
 
-  XmppReturntqStatus Send(const tqStatus & s);
-  XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s);
-  XmppReturntqStatus SendProbe(const Jid& jid);
+  XmppReturnStatus Send(const Status & s);
+  XmppReturnStatus SendDirected(const Jid & j, const Status & s);
+  XmppReturnStatus SendProbe(const Jid& jid);
 
   virtual int ProcessStart();
 private:
-  XmlElement * TranslatetqStatus(const tqStatus & s);
+  XmlElement * TranslateStatus(const Status & s);
   scoped_ptr<XmlElement> stanza_;
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
index cee7058a..31d1ae77 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
@@ -77,7 +77,7 @@ PresencePushTask::ProcessStart() {
   const XmlElement * stanza = NextStanza();
   if (stanza == NULL)
     return STATE_BLOCKED;
-  tqStatus s;
+  Status s;
 
   s.set_jid(Jid(stanza->Attr(TQN_FROM)));
 
@@ -114,23 +114,23 @@ PresencePushTask::ProcessStart() {
 
     const XmlElement * show = stanza->FirstNamed(TQN_SHOW);
     if (show == NULL || show->FirstChild() == NULL) {
-      s.set_show(tqStatus::SHOW_ONLINE);
+      s.set_show(Status::SHOW_ONLINE);
     }
     else {
       if (show->BodyText() == "away") {
-        s.set_show(tqStatus::SHOW_AWAY);
+        s.set_show(Status::SHOW_AWAY);
       }
       else if (show->BodyText() == "xa") {
-        s.set_show(tqStatus::SHOW_XA);
+        s.set_show(Status::SHOW_XA);
       }
       else if (show->BodyText() == "dnd") {
-        s.set_show(tqStatus::SHOW_DND);
+        s.set_show(Status::SHOW_DND);
       }
       else if (show->BodyText() == "chat") {
-        s.set_show(tqStatus::SHOW_CHAT);
+        s.set_show(Status::SHOW_CHAT);
       }
       else {
-        s.set_show(tqStatus::SHOW_ONLINE);
+        s.set_show(Status::SHOW_ONLINE);
       }
     }
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
index 06c68015..77459647 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
@@ -32,7 +32,7 @@ class PresencePushTask : public XmppTask {
 public:
   PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {}
   virtual int ProcessStart();
-  sigslot::signal1<const tqStatus &>SignalStatusUpdate;
+  sigslot::signal1<const Status &>SignalStatusUpdate;
 
 protected:
   virtual bool HandleStanza(const XmlElement * stanza);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index 264ed725..cab9312f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -26,9 +26,9 @@
 
 namespace buzz {
 
-class tqStatus {
+class Status {
 public:
-  tqStatus() :
+  Status() :
     pri_(0),
     show_(SHOW_NONE),
     available_(false),
@@ -39,7 +39,7 @@ public:
     is_google_client_(false),
     feedback_probation_(false) {};
 
-  ~tqStatus() {}
+  ~Status() {}
 
   // These are arranged in "priority order", i.e., if we see
   // two statuses at the same priority but with different Shows,
@@ -86,7 +86,7 @@ public:
   void set_feedback_probation(bool f) { feedback_probation_ = f; }
   void set_sent_time(const std::string& time) { sent_time_ = time; }
 
-  void UpdateWith(const tqStatus & new_value) {
+  void UpdateWith(const Status & new_value) {
     if (!new_value.know_capabilities()) {
        bool k = know_capabilities();
        bool i = is_google_client();
@@ -105,15 +105,15 @@ public:
     }
   }
 
-  bool HasQuiettqStatus() const {
+  bool HasQuietStatus() const {
     if (status_.empty())
       return false;
-    return !(QuiettqStatus().empty());
+    return !(QuietStatus().empty());
   }
 
   // Knowledge of other clients' silly automatic status strings -
   // Don't show these.
-  std::string QuiettqStatus() const {
+  std::string QuietStatus() const {
     if (jid_.resource().find("Psi") != std::string::npos) {
       if (status_ == "Online" ||
           status_.find("Auto Status") != std::string::npos)
@@ -123,18 +123,18 @@ public:
       if (status_ == "Sorry, I ran out for a bit!")
         return STR_EMPTY;
     }
-    return TrimtqStatus(status_);
+    return TrimStatus(status_);
   }
 
-  std::string ExplicittqStatus() const {
-    std::string result = QuiettqStatus();
+  std::string ExplicitStatus() const {
+    std::string result = QuietStatus();
     if (result.empty()) {
-      result = ShowtqStatus();
+      result = ShowStatus();
     }
     return result;
   }
 
-  std::string ShowtqStatus() const {
+  std::string ShowStatus() const {
     std::string result;
     if (!available()) {
       result = "Offline";
@@ -159,7 +159,7 @@ public:
     return result;
   }
 
-  static std::string TrimtqStatus(const std::string & st) {
+  static std::string TrimStatus(const std::string & st) {
     std::string s(st);
     int j = 0;
     bool collapsing = true;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
index 40e694e2..7d966fb3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
@@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) {
   RunTasks();
 }
 
-buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
+buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
   return client_->SendStanza(stanza);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
index 0314b2fd..fd6f88bb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
@@ -62,7 +62,7 @@ public:
 
   void OnMessage(cricket::Message *pmsg);
 
-  buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza);
+  buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza);
 
 private:
   buzz::XmppClient *client_;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index fa6a14a6..959b6f88 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
@@ -86,7 +86,7 @@ public:
   void OnSocketClosed();
 };
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) {
   if (socket == NULL)
     return XMPP_RETURN_BADARGUMENT;
@@ -237,7 +237,7 @@ XmppClient::ProcessResponse() {
   return STATE_BLOCKED;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::Disconnect() {
   if (d_->socket_.get() == NULL)
     return XMPP_RETURN_BADSTATE;
@@ -263,17 +263,17 @@ XmppClient::NextId() {
   return d_->engine_->NextId();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendStanza(const XmlElement * stanza) {
   return d_->engine_->SendStanza(stanza);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) {
   return d_->engine_->SendStanzaError(old_stanza, xse, message);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendRaw(const std::string & text) {
   return d_->engine_->SendRaw(text);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
index fd65c39c..f8b4798c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
@@ -74,14 +74,14 @@ public:
   XmppClient(Task * parent);
   ~XmppClient();
 
-  XmppReturntqStatus Connect(const XmppClientSettings & settings,
+  XmppReturnStatus Connect(const XmppClientSettings & settings,
                            AsyncSocket * socket,
                            PreXmppAuth * preauth);
   
   virtual Task * GetParent(int code);
   virtual int ProcessStart();
   virtual int ProcessResponse();
-  XmppReturntqStatus Disconnect();
+  XmppReturnStatus Disconnect();
   const Jid & jid();
   
   sigslot::signal1<XmppEngine::State> SignalStateChange;
@@ -97,9 +97,9 @@ public:
   std::string GetAuthCookie();
 
   std::string NextId();
-  XmppReturntqStatus SendStanza(const XmlElement *stanza);
-  XmppReturntqStatus SendRaw(const std::string & text);
-  XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  XmppReturnStatus SendStanza(const XmlElement *stanza);
+  XmppReturnStatus SendRaw(const std::string & text);
+  XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                        XmppStanzaError code,
                        const std::string & text);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
index 58576328..1497c3ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
@@ -66,9 +66,9 @@ enum XmppStanzaError {
   XSE_UNEXPECTED_REQUEST,
 };
 
-// XmppReturntqStatus
+// XmppReturnStatus
 //    This is used by API functions to synchronously return status.
-enum XmppReturntqStatus {
+enum XmppReturnStatus {
   XMPP_RETURN_OK,
   XMPP_RETURN_BADARGUMENT,
   XMPP_RETURN_BADSTATE,
@@ -171,34 +171,34 @@ public:
   // SOCKET INPUT AND OUTPUT ------------------------------------------------
 
   //! Registers the handler for socket output
-  virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
+  virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
 
   //! Provides socket input to the engine
-  virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0;
+  virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0;
 
   //! Advises the engine that the socket has closed
-  virtual XmppReturntqStatus ConnectionClosed() = 0;
+  virtual XmppReturnStatus ConnectionClosed() = 0;
 
   // SESSION SETUP ---------------------------------------------------------
 
   //! Indicates the (bare) JID for the user to use.
-  virtual XmppReturntqStatus SetUser(const Jid & jid)= 0;
+  virtual XmppReturnStatus SetUser(const Jid & jid)= 0;
 
   //! Get the login (bare) JID.
   virtual const Jid & GetUser() = 0;
 
   //! Provides different methods for credentials for login.
   //! Takes ownership of this object; deletes when login is done
-  virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0;
+  virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0;
 
   //! Sets whether TLS will be used within the connection (default true).
-  virtual XmppReturntqStatus SetUseTls(bool useTls) = 0;
+  virtual XmppReturnStatus SetUseTls(bool useTls) = 0;
 
   //! Sets an alternate domain from which we allows TLS certificates.
   //! This is for use in the case where a we want to allow a proxy to
   //! serve up its own certificate rather than one owned by the underlying
   //! domain.
-  virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
+  virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
 
   //! Gets whether TLS will be used within the connection.
   virtual bool GetUseTls() = 0;
@@ -206,7 +206,7 @@ public:
   //! Sets the request resource name, if any (optional).
   //! Note that the resource name may be overridden by the server; after
   //! binding, the actual resource name is available as part of FullJid().
-  virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0;
+  virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0;
 
   //! Gets the request resource name.
   virtual const std::string & GetRequestedResource() = 0;
@@ -214,12 +214,12 @@ public:
   // SESSION MANAGEMENT ---------------------------------------------------
 
   //! Set callback for state changes.
-  virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
+  virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
 
   //! Initiates the XMPP connection.
   //! After supplying connection settings, call this once to initiate,
   //! (optionally) encrypt, authenticate, and bind the connection.
-  virtual XmppReturntqStatus Connect() = 0;
+  virtual XmppReturnStatus Connect() = 0;
 
   //! The current engine state.
   virtual State GetState() = 0;
@@ -240,7 +240,7 @@ public:
   //! Sends CloseConnection to output, and disconnects and registered
   //! session handlers.  After Disconnect completes, it is guaranteed
   //! that no further callbacks will be made.
-  virtual XmppReturntqStatus Disconnect() = 0;
+  virtual XmppReturnStatus Disconnect() = 0;
 
   // APPLICATION USE -------------------------------------------------------
 
@@ -257,33 +257,33 @@ public:
   //! Adds a listener for session events.
   //! Stanza delivery is chained to session handlers; the first to
   //! return 'true' is the last to get each stanza.
-  virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
+  virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
 
   //! Removes a listener for session events.
-  virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
+  virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
 
   //! Sends a stanza to the server.
-  virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0;
+  virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0;
 
   //! Sends raw text to the server
-  virtual XmppReturntqStatus SendRaw(const std::string & text) = 0;
+  virtual XmppReturnStatus SendRaw(const std::string & text) = 0;
 
   //! Sends an iq to the server, and registers a callback for the result.
   //! Returns the cookie passed to the result handler.
-  virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+  virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
                                   XmppIqHandler* iq_handler,
                                   XmppIqCookie* cookie) = 0;
 
   //! Unregisters an iq callback handler given its cookie.
   //! No callback will come to this handler after it's unregistered.
-  virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+  virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
                                       XmppIqHandler** iq_handler) = 0;
 
 
   //! Forms and sends an error in response to the given stanza.
   //! Swaps to and from, sets type to "error", and adds error information
   //! based on the passed code.  Text is optional and may be STR_EMPTY.
-  virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                                            XmppStanzaError code,
                                            const std::string & text) = 0;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
index c9569524..3d363a78 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
@@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() {
   DeleteIqCookies();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
   if (state_ < STATE_OPENING || state_ > STATE_OPEN)
     return XMPP_RETURN_BADSTATE;
@@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::ConnectionClosed() {
   if (state_ != STATE_CLOSED) {
     EnterExit ee(this);
@@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetUseTls(bool useTls) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() {
   return tls_needed_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetUser(const Jid & jid) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() {
   return user_jid_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetRequestedResource(const std::string & resource) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() {
   return requested_resource_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
                                  XmppEngine::HandlerLevel level) {
   if (state_ == STATE_CLOSED)
@@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
 
   bool found = false;
@@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::Connect() {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -245,7 +245,7 @@ XmppEngineImpl::Connect() {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendStanza(const XmlElement * element) {
   if (state_ == STATE_CLOSED)
     return XMPP_RETURN_BADSTATE;
@@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendRaw(const std::string & text) {
   if (state_ == STATE_CLOSED || login_task_.get())
     return XMPP_RETURN_BADSTATE;
@@ -282,7 +282,7 @@ XmppEngineImpl::NextId() {
   return ss.str();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::Disconnect() {
 
   if (state_ != STATE_CLOSED) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
index 6011d9e8..c36f168c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
@@ -57,33 +57,33 @@ public:
   // SOCKET INPUT AND OUTPUT ------------------------------------------------
 
   //! Registers the handler for socket output
-  virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh);
+  virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh);
 
   //! Provides socket input to the engine
-  virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len);
+  virtual XmppReturnStatus HandleInput(const char * bytes, size_t len);
 
   //! Advises the engine that the socket has closed
-  virtual XmppReturntqStatus ConnectionClosed();
+  virtual XmppReturnStatus ConnectionClosed();
 
   // SESSION SETUP ---------------------------------------------------------
 
   //! Indicates the (bare) JID for the user to use.
-  virtual XmppReturntqStatus SetUser(const Jid & jid);
+  virtual XmppReturnStatus SetUser(const Jid & jid);
 
   //! Get the login (bare) JID.
   virtual const Jid & GetUser();
 
   //! Indicates the autentication to use.  Takes ownership of the object.
-  virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler);
+  virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler);
 
   //! Sets whether TLS will be used within the connection (default true).
-  virtual XmppReturntqStatus SetUseTls(bool useTls);
+  virtual XmppReturnStatus SetUseTls(bool useTls);
 
   //! Sets an alternate domain from which we allows TLS certificates.
   //! This is for use in the case where a we want to allow a proxy to
   //! serve up its own certificate rather than one owned by the underlying
   //! domain.
-  virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain);
+  virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain);
 
   //! Gets whether TLS will be used within the connection.
   virtual bool GetUseTls();
@@ -91,7 +91,7 @@ public:
   //! Sets the request resource name, if any (optional).
   //! Note that the resource name may be overridden by the server; after
   //! binding, the actual resource name is available as part of FullJid().
-  virtual XmppReturntqStatus SetRequestedResource(const std::string& resource);
+  virtual XmppReturnStatus SetRequestedResource(const std::string& resource);
 
   //! Gets the request resource name.
   virtual const std::string & GetRequestedResource();
@@ -99,12 +99,12 @@ public:
   // SESSION MANAGEMENT ---------------------------------------------------
 
   //! Set callback for state changes.
-  virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler);
+  virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler);
 
   //! Initiates the XMPP connection.
   //! After supplying connection settings, call this once to initiate,
   //! (optionally) encrypt, authenticate, and bind the connection.
-  virtual XmppReturntqStatus Connect();
+  virtual XmppReturnStatus Connect();
 
   //! The current engine state.
   virtual State GetState() { return state_; }
@@ -125,40 +125,40 @@ public:
   //! Sends CloseConnection to output, and disconnects and registered
   //! session handlers.  After Disconnect completes, it is guaranteed
   //! that no further callbacks will be made.
-  virtual XmppReturntqStatus Disconnect();
+  virtual XmppReturnStatus Disconnect();
 
   // APPLICATION USE -------------------------------------------------------
 
   //! Adds a listener for session events.
   //! Stanza delivery is chained to session handlers; the first to
   //! return 'true' is the last to get each stanza.
-  virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler,
+  virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler,
                                             XmppEngine::HandlerLevel level);
 
   //! Removes a listener for session events.
-  virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
+  virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
 
   //! Sends a stanza to the server.
-  virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza);
+  virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza);
 
   //! Sends raw text to the server
-  virtual XmppReturntqStatus SendRaw(const std::string & text);
+  virtual XmppReturnStatus SendRaw(const std::string & text);
 
   //! Sends an iq to the server, and registers a callback for the result.
   //! Returns the cookie passed to the result handler.
-  virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+  virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
                                   XmppIqHandler* iq_handler,
                                   XmppIqCookie* cookie);
 
   //! Unregisters an iq callback handler given its cookie.
   //! No callback will come to this handler after it's unregistered.
-  virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+  virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
                                       XmppIqHandler** iq_handler);
 
   //! Forms and sends an error in response to the given stanza.
   //! Swaps to and from, sets type to "error", and adds error information
   //! based on the passed code.  Text is optional and may be STR_EMPTY.
-  virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                                            XmppStanzaError code,
                                            const std::string & text);
 
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 38f268b9..7987856e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -54,7 +54,7 @@ private:
 };
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
   XmppIqCookie* cookie) {
   if (state_ == STATE_CLOSED)
@@ -85,7 +85,7 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
 }
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie,
     XmppIqHandler ** iq_handler) {
 
@@ -199,7 +199,7 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
 }
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
index e7ac0e04..c9d86ba6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
@@ -55,14 +55,14 @@ XmppTask::StopImpl() {
   }
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppTask::SendStanza(const XmlElement * stanza) {
   if (client_ == NULL)
     return XMPP_RETURN_BADSTATE;
   return client_->SendStanza(stanza);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppTask::SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
index a1ed3dd3..0bd7c4b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
@@ -78,9 +78,9 @@ public:
 protected:
   friend class XmppClient;
   
-  XmppReturntqStatus SendStanza(const XmlElement * stanza);
-  XmppReturntqStatus SetResult(const std::string & code);
-  XmppReturntqStatus SendStanzaError(const XmlElement * element_original,
+  XmppReturnStatus SendStanza(const XmlElement * stanza);
+  XmppReturnStatus SetResult(const std::string & code);
+  XmppReturnStatus SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text);