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, 6 insertions, 6 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index 959b6f88..f5b9d0b4 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();
 };
 
-XmppReturnStatus
+XmppReturntqStatus
 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;
 }
 
-XmppReturnStatus
+XmppReturntqStatus
 XmppClient::Disconnect() {
   if (d_->socket_.get() == NULL)
     return XMPP_RETURN_BADSTATE;
@@ -245,7 +245,7 @@ XmppClient::Disconnect() {
   return XMPP_RETURN_OK;
 }
 
-XmppClient::XmppClient(Task * parent) : Task(parent), 
+XmppClient::XmppClient(Task * tqparent) : Task(tqparent), 
     delivering_signal_(false) {
   d_.reset(new Private(this));
 }
@@ -263,17 +263,17 @@ XmppClient::NextId() {
   return d_->engine_->NextId();
 }
 
-XmppReturnStatus
+XmppReturntqStatus
 XmppClient::SendStanza(const XmlElement * stanza) {
   return d_->engine_->SendStanza(stanza);
 }
 
-XmppReturnStatus
+XmppReturntqStatus
 XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) {
   return d_->engine_->SendStanzaError(old_stanza, xse, message);
 }
 
-XmppReturnStatus
+XmppReturntqStatus
 XmppClient::SendRaw(const std::string & text) {
   return d_->engine_->SendRaw(text);
 }