diff options
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp')
-rw-r--r-- | kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp | 304 |
1 files changed, 152 insertions, 152 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index a5affaa0..c78875bc 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -36,7 +36,7 @@ //! //! The entire Task system is heavily founded on Qt. All Tasks have a parent, //! except for the root Task, and are considered QObjects. By using Qt's RTTI -//! facilities (QObject::sender(), QObject::isA(), etc), you can use a +//! facilities (TQObject::sender(), TQObject::isA(), etc), you can use a //! "fire and forget" approach with Tasks. //! //! \code @@ -50,8 +50,8 @@ //! Session::Session() //! { //! client = new Client; -//! connect(client, SIGNAL(handshaken()), SLOT(clientHandshaken())); -//! connect(client, SIGNAL(authFinished(bool, int, const QString &)), SLOT(authFinished(bool, int, const QString &))); +//! connect(client, TQT_SIGNAL(handshaken()), TQT_SLOT(clientHandshaken())); +//! connect(client, TQT_SIGNAL(authFinished(bool, int, const TQString &)), TQT_SLOT(authFinished(bool, int, const TQString &))); //! client->connectToHost("jabber.org"); //! } //! @@ -60,7 +60,7 @@ //! client->authDigest("jabtest", "12345", "Psi"); //! } //! -//! void Session::authFinished(bool success, int, const QString &err) +//! void Session::authFinished(bool success, int, const TQString &err) //! { //! if(success) //! printf("Login success!"); @@ -70,10 +70,10 @@ //! \endcode #include<stdarg.h> -#include<qmap.h> -#include<qobjectlist.h> -#include<qtimer.h> -#include<qguardedptr.h> +#include<tqmap.h> +#include<tqobjectlist.h> +#include<tqtimer.h> +#include<tqguardedptr.h> #include"xmpp_tasks.h" #include"xmpp_xmlcommon.h" #include"s5b.h" @@ -83,10 +83,10 @@ /*#include<stdio.h> #include<stdarg.h> -#include<qstring.h> -#include<qdom.h> -#include<qobjectlist.h> -#include<qtimer.h> +#include<tqstring.h> +#include<tqdom.h> +#include<tqobjectlist.h> +#include<tqtimer.h> #include"xmpp_stream.h" #include"xmpp_tasks.h" #include"xmpp_xmlcommon.h" @@ -122,13 +122,13 @@ public: ClientPrivate() {} ClientStream *stream; - QDomDocument doc; + TQDomDocument doc; int id_seed; Task *root; - QString host, user, pass, resource; - QString osname, tzname, clientName, clientVersion, capsNode, capsVersion, capsExt; + TQString host, user, pass, resource; + TQString osname, tzname, clientName, clientVersion, capsNode, capsVersion, capsExt; DiscoItem::Identity identity; - QMap<QString,Features> extension_features; + TQMap<TQString,Features> extension_features; int tzoffset; bool active; @@ -139,12 +139,12 @@ public: JidLinkManager *jlman; FileTransferManager *ftman; bool ftEnabled; - QValueList<GroupChat> groupChatList; + TQValueList<GroupChat> groupChatList; }; -Client::Client(QObject *par) -:QObject(par) +Client::Client(TQObject *par) +:TQObject(par) { d = new ClientPrivate; d->tzoffset = 0; @@ -162,10 +162,10 @@ Client::Client(QObject *par) d->stream = 0; d->s5bman = new S5BManager(this); - connect(d->s5bman, SIGNAL(incomingReady()), SLOT(s5b_incomingReady())); + connect(d->s5bman, TQT_SIGNAL(incomingReady()), TQT_SLOT(s5b_incomingReady())); d->ibbman = new IBBManager(this); - connect(d->ibbman, SIGNAL(incomingReady()), SLOT(ibb_incomingReady())); + connect(d->ibbman, TQT_SIGNAL(incomingReady()), TQT_SLOT(ibb_incomingReady())); d->jlman = new JidLinkManager(this); @@ -188,19 +188,19 @@ Client::~Client() void Client::connectToServer(ClientStream *s, const Jid &j, bool auth) { d->stream = s; - //connect(d->stream, SIGNAL(connected()), SLOT(streamConnected())); - //connect(d->stream, SIGNAL(handshaken()), SLOT(streamHandshaken())); - connect(d->stream, SIGNAL(error(int)), SLOT(streamError(int))); - //connect(d->stream, SIGNAL(sslCertificateReady(const QSSLCert &)), SLOT(streamSSLCertificateReady(const QSSLCert &))); - connect(d->stream, SIGNAL(readyRead()), SLOT(streamReadyRead())); - //connect(d->stream, SIGNAL(closeFinished()), SLOT(streamCloseFinished())); - connect(d->stream, SIGNAL(incomingXml(const QString &)), SLOT(streamIncomingXml(const QString &))); - connect(d->stream, SIGNAL(outgoingXml(const QString &)), SLOT(streamOutgoingXml(const QString &))); + //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); + //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); + connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); + //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &))); + connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); + //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); + connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &))); + connect(d->stream, TQT_SIGNAL(outgoingXml(const TQString &)), TQT_SLOT(streamOutgoingXml(const TQString &))); d->stream->connectToServer(j, auth); } -void Client::start(const QString &host, const QString &user, const QString &pass, const QString &_resource) +void Client::start(const TQString &host, const TQString &user, const TQString &pass, const TQString &_resource) { // TODO d->host = host; @@ -213,14 +213,14 @@ void Client::start(const QString &host, const QString &user, const QString &pass d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); - connect(pp, SIGNAL(subscription(const Jid &, const QString &)), SLOT(ppSubscription(const Jid &, const QString &))); - connect(pp, SIGNAL(presence(const Jid &, const Status &)), SLOT(ppPresence(const Jid &, const Status &))); + connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); - connect(pm, SIGNAL(message(const Message &)), SLOT(pmMessage(const Message &))); + connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); JT_PushRoster *pr = new JT_PushRoster(rootTask()); - connect(pr, SIGNAL(roster(const Roster &)), SLOT(prRoster(const Roster &))); + connect(pr, TQT_SIGNAL(roster(const Roster &)), TQT_SLOT(prRoster(const Roster &))); new JT_ServInfo(rootTask()); @@ -266,10 +266,10 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) { Jid jid(room + "@" + host + "/" + nick); - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; if(i.j.compare(jid, false)) { i.j = jid; @@ -286,10 +286,10 @@ void Client::groupChatChangeNick(const QString &host, const QString &room, const } } -bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick) +bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQString &nick) { Jid jid(room + "@" + host + "/" + nick); - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) { GroupChat &i = *it; if(i.j.compare(jid, false)) { // if this room is shutting down, then free it up @@ -302,7 +302,7 @@ bool Client::groupChatJoin(const QString &host, const QString &room, const QStri ++it; } - debug(QString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -315,10 +315,10 @@ bool Client::groupChatJoin(const QString &host, const QString &room, const QStri return true; } -bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password) +bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password) { Jid jid(room + "@" + host + "/" + nick); - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) { GroupChat &i = *it; if(i.j.compare(jid, false)) { // if this room is shutting down, then free it up @@ -331,7 +331,7 @@ bool Client::groupChatJoin(const QString &host, const QString &room, const QStri ++it; } - debug(QString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -344,11 +344,11 @@ bool Client::groupChatJoin(const QString &host, const QString &room, const QStri return true; } -void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s) +void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) { Jid jid(room + "@" + host); bool found = false; - for(QValueList<GroupChat>::ConstIterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::ConstIterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { const GroupChat &i = *it; if(i.j.compare(jid, false)) { found = true; @@ -367,17 +367,17 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const j->go(true); } -void Client::groupChatLeave(const QString &host, const QString &room) +void Client::groupChatLeave(const TQString &host, const TQString &room) { Jid jid(room + "@" + host); - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; if(!i.j.compare(jid, false)) continue; i.status = GroupChat::Closing; - debug(QString("Client: Leaving: [%1]\n").arg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); Status s; @@ -404,7 +404,7 @@ void Client::close(bool) { if(d->stream) { if(d->active) { - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; i.status = GroupChat::Closing; @@ -467,17 +467,17 @@ void Client::streamCloseFinished() closeFinished(); }*/ -static QDomElement oldStyleNS(const QDomElement &e) +static TQDomElement oldStyleNS(const TQDomElement &e) { // find closest parent with a namespace - QDomNode par = e.parentNode(); + TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; - QDomElement i; + TQDomElement i; uint x; //if(noShowNS) i = e.ownerDocument().createElement(e.tagName()); @@ -485,7 +485,7 @@ static QDomElement oldStyleNS(const QDomElement &e) // i = e.ownerDocument().createElementNS(e.namespaceURI(), e.tagName()); // copy attributes - QDomNamedNodeMap al = e.attributes(); + TQDomNamedNodeMap al = e.attributes(); for(x = 0; x < al.count(); ++x) i.setAttributeNode(al.item(x).cloneNode().toAttr()); @@ -493,9 +493,9 @@ static QDomElement oldStyleNS(const QDomElement &e) i.setAttribute("xmlns", e.namespaceURI()); // copy children - QDomNodeList nl = e.childNodes(); + TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { - QDomNode n = nl.item(x); + TQDomNode n = nl.item(x); if(n.isElement()) i.appendChild(oldStyleNS(n.toElement())); else @@ -507,44 +507,44 @@ static QDomElement oldStyleNS(const QDomElement &e) void Client::streamReadyRead() { // HACK HACK HACK - QGuardedPtr<ClientStream> pstream = d->stream; + TQGuardedPtr<ClientStream> pstream = d->stream; while(pstream && d->stream->stanzaAvailable()) { Stanza s = d->stream->read(); - QString out = s.toString(); - debug(QString("Client: incoming: [\n%1]\n").arg(out)); + TQString out = s.toString(); + debug(TQString("Client: incoming: [\n%1]\n").arg(out)); xmlIncoming(out); - QDomElement x = oldStyleNS(s.element()); + TQDomElement x = oldStyleNS(s.element()); distribute(x); } } -void Client::streamIncomingXml(const QString &s) +void Client::streamIncomingXml(const TQString &s) { - QString str = s; + TQString str = s; if(str.at(str.length()-1) != '\n') str += '\n'; xmlIncoming(str); } -void Client::streamOutgoingXml(const QString &s) +void Client::streamOutgoingXml(const TQString &s) { - QString str = s; + TQString str = s; if(str.at(str.length()-1) != '\n') str += '\n'; xmlOutgoing(str); } -void Client::debug(const QString &str) +void Client::debug(const TQString &str) { debugText(str); } -QString Client::genUniqueId() +TQString Client::genUniqueId() { - QString s; + TQString s; s.sprintf("a%x", d->id_seed); d->id_seed += 0x10; return s; @@ -555,12 +555,12 @@ Task *Client::rootTask() return d->root; } -QDomDocument *Client::doc() const +TQDomDocument *Client::doc() const { return &d->doc; } -void Client::distribute(const QDomElement &x) +void Client::distribute(const TQDomElement &x) { if(x.hasAttribute("from")) { Jid j(x.attribute("from")); @@ -575,41 +575,41 @@ void Client::distribute(const QDomElement &x) } } -static QDomElement addCorrectNS(const QDomElement &e) +static TQDomElement addCorrectNS(const TQDomElement &e) { uint x; // grab child nodes - /*QDomDocumentFragment frag = e.ownerDocument().createDocumentFragment(); - QDomNodeList nl = e.childNodes(); + /*TQDomDocumentFragment frag = e.ownerDocument().createDocumentFragment(); + TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) frag.appendChild(nl.item(x).cloneNode());*/ // find closest xmlns - QDomNode n = e; + TQDomNode n = e; while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) n = n.parentNode(); - QString ns; + TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; else ns = n.toElement().attribute("xmlns"); // make a new node - QDomElement i = e.ownerDocument().createElementNS(ns, e.tagName()); + TQDomElement i = e.ownerDocument().createElementNS(ns, e.tagName()); // copy attributes - QDomNamedNodeMap al = e.attributes(); + TQDomNamedNodeMap al = e.attributes(); for(x = 0; x < al.count(); ++x) { - QDomAttr a = al.item(x).toAttr(); + TQDomAttr a = al.item(x).toAttr(); if(a.name() != "xmlns") i.setAttributeNodeNS(a.cloneNode().toAttr()); } // copy children - QDomNodeList nl = e.childNodes(); + TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { - QDomNode n = nl.item(x); + TQDomNode n = nl.item(x); if(n.isElement()) i.appendChild(addCorrectNS(n.toElement())); else @@ -620,40 +620,40 @@ static QDomElement addCorrectNS(const QDomElement &e) return i; } -void Client::send(const QDomElement &x) +void Client::send(const TQDomElement &x) { if(!d->stream) return; - //QString out; - //QTextStream ts(&out, IO_WriteOnly); + //TQString out; + //TQTextStream ts(&out, IO_WriteOnly); //x.save(ts, 0); - //QString out = Stream::xmlToString(x); - //debug(QString("Client: outgoing: [\n%1]\n").arg(out)); + //TQString out = Stream::xmlToString(x); + //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); //xmlOutgoing(out); - QDomElement e = addCorrectNS(x); + TQDomElement e = addCorrectNS(x); Stanza s = d->stream->createStanza(e); if(s.isNull()) { //printf("bad stanza??\n"); return; } - QString out = s.toString(); - debug(QString("Client: outgoing: [\n%1]\n").arg(out)); + TQString out = s.toString(); + debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); d->stream->write(s); } -void Client::send(const QString &str) +void Client::send(const TQString &str) { if(!d->stream) return; - debug(QString("Client: outgoing: [\n%1]\n").arg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); xmlOutgoing(str); static_cast<ClientStream*>(d->stream)->writeDirect(str); } @@ -673,29 +673,29 @@ const ResourceList & Client::resourceList() const return d->resourceList; } -QString Client::host() const +TQString Client::host() const { return d->host; } -QString Client::user() const +TQString Client::user() const { return d->user; } -QString Client::pass() const +TQString Client::pass() const { return d->pass; } -QString Client::resource() const +TQString Client::resource() const { return d->resource; } Jid Client::jid() const { - QString s; + TQString s; if(!d->user.isEmpty()) s += d->user + '@'; s += d->host; @@ -707,7 +707,7 @@ Jid Client::jid() const return Jid(s); } -void Client::ppSubscription(const Jid &j, const QString &s) +void Client::ppSubscription(const Jid &j, const TQString &s) { subscription(j, s); } @@ -715,17 +715,17 @@ void Client::ppSubscription(const Jid &j, const QString &s) void Client::ppPresence(const Jid &j, const Status &s) { if(s.isAvailable()) - debug(QString("Client: %1 is available.\n").arg(j.full())); + debug(TQString("Client: %1 is available.\n").arg(j.full())); else - debug(QString("Client: %1 is unavailable.\n").arg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; if(i.j.compare(j, false)) { bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false; - debug(QString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us)); + debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -796,7 +796,7 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(QString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); (*rit).setStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); @@ -808,12 +808,12 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(QString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(QString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); } resourceAvailable(j, r); @@ -829,7 +829,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!s.isAvailable()) { if(found) { (*rit).setStatus(s); - debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); i->setLastUnavailableStatus(s); @@ -841,12 +841,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(QString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(QString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } resourceAvailable(j, r); @@ -855,10 +855,10 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(QString("Client: Message from %1\n").arg(m.from().full())); + debug(TQString("Client: Message from %1\n").arg(m.from().full())); if(m.type() == "groupchat") { - for(QValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { + for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { const GroupChat &i = *it; if(!i.j.compare(m.from(), false)) @@ -883,7 +883,7 @@ void Client::rosterRequest() return; JT_Roster *r = new JT_Roster(rootTask()); - connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished())); + connect(r, TQT_SIGNAL(finished()), TQT_SLOT(slotRosterRequestFinished())); r->get(); d->roster.flagAllForDelete(); // mod_groups patch r->go(true); @@ -927,7 +927,7 @@ void Client::importRoster(const Roster &r) void Client::importRosterItem(const RosterItem &item) { - QString substr; + TQString substr; switch(item.subscription().type()) { case Subscription::Both: substr = "<-->"; break; @@ -942,10 +942,10 @@ void Client::importRosterItem(const RosterItem &item) substr = "----"; break; } - QString dstr, str; + TQString dstr, str; str.sprintf(" %s %-32s", substr.latin1(), item.jid().full().latin1()); if(!item.name().isEmpty()) - str += QString(" [") + item.name() + "]"; + str += TQString(" [") + item.name() + "]"; str += '\n'; // Remove @@ -986,7 +986,7 @@ void Client::sendMessage(const Message &m) j->go(true); } -void Client::sendSubscription(const Jid &jid, const QString &type) +void Client::sendSubscription(const Jid &jid, const TQString &type) { JT_Presence *j = new JT_Presence(rootTask()); j->sub(jid, type); @@ -1006,12 +1006,12 @@ void Client::setPresence(const Status &s) //r.setStatus(s); } -QString Client::OSName() const +TQString Client::OSName() const { return d->osname; } -QString Client::timeZone() const +TQString Client::timeZone() const { return d->tzname; } @@ -1021,58 +1021,58 @@ int Client::timeZoneOffset() const return d->tzoffset; } -QString Client::clientName() const +TQString Client::clientName() const { return d->clientName; } -QString Client::clientVersion() const +TQString Client::clientVersion() const { return d->clientVersion; } -QString Client::capsNode() const +TQString Client::capsNode() const { return d->capsNode; } -QString Client::capsVersion() const +TQString Client::capsVersion() const { return d->capsVersion; } -QString Client::capsExt() const +TQString Client::capsExt() const { return d->capsExt; } -void Client::setOSName(const QString &name) +void Client::setOSName(const TQString &name) { d->osname = name; } -void Client::setTimeZone(const QString &name, int offset) +void Client::setTimeZone(const TQString &name, int offset) { d->tzname = name; d->tzoffset = offset; } -void Client::setClientName(const QString &s) +void Client::setClientName(const TQString &s) { d->clientName = s; } -void Client::setClientVersion(const QString &s) +void Client::setClientVersion(const TQString &s) { d->clientVersion = s; } -void Client::setCapsNode(const QString &s) +void Client::setCapsNode(const TQString &s) { d->capsNode = s; } -void Client::setCapsVersion(const QString &s) +void Client::setCapsVersion(const TQString &s) { d->capsVersion = s; } @@ -1087,7 +1087,7 @@ void Client::setIdentity(DiscoItem::Identity identity) d->identity = identity; } -void Client::addExtension(const QString& ext, const Features& features) +void Client::addExtension(const TQString& ext, const Features& features) { if (!ext.isEmpty()) { d->extension_features[ext] = features; @@ -1095,7 +1095,7 @@ void Client::addExtension(const QString& ext, const Features& features) } } -void Client::removeExtension(const QString& ext) +void Client::removeExtension(const TQString& ext) { if (d->extension_features.contains(ext)) { d->extension_features.remove(ext); @@ -1103,12 +1103,12 @@ void Client::removeExtension(const QString& ext) } } -QStringList Client::extensions() const +TQStringList Client::extensions() const { return d->extension_features.keys(); } -const Features& Client::extension(const QString& ext) const +const Features& Client::extension(const TQString& ext) const { return d->extension_features[ext]; } @@ -1146,32 +1146,32 @@ class Task::TaskPrivate public: TaskPrivate() {} - QString id; + TQString id; bool success; int statusCode; - QString statusString; + TQString statusString; Client *client; bool insig, deleteme, autoDelete; bool done; }; Task::Task(Task *parent) -:QObject(parent) +:TQObject(parent) { init(); d->client = parent->client(); d->id = client()->genUniqueId(); - connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected())); + connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) -:QObject(0) +:TQObject(0) { init(); d->client = parent; - connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected())); + connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } Task::~Task() @@ -1191,7 +1191,7 @@ void Task::init() Task *Task::parent() const { - return (Task *)QObject::parent(); + return (Task *)TQObject::parent(); } Client *Task::client() const @@ -1199,12 +1199,12 @@ Client *Task::client() const return d->client; } -QDomDocument *Task::doc() const +TQDomDocument *Task::doc() const { return client()->doc(); } -QString Task::id() const +TQString Task::id() const { return d->id; } @@ -1219,7 +1219,7 @@ int Task::statusCode() const return d->statusCode; } -const QString & Task::statusString() const +const TQString & Task::statusString() const { return d->statusString; } @@ -1231,17 +1231,17 @@ void Task::go(bool autoDelete) onGo(); } -bool Task::take(const QDomElement &x) +bool Task::take(const TQDomElement &x) { - const QObjectList *p = children(); + const TQObjectList *p = children(); if(!p) return false; // pass along the xml - QObjectListIt it(*p); + TQObjectListIt it(*p); Task *t; for(; it.current(); ++it) { - QObject *obj = it.current(); + TQObject *obj = it.current(); if(!obj->inherits("XMPP::Task")) continue; @@ -1275,16 +1275,16 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - QTimer::singleShot(0, this, SLOT(done())); + TQTimer::singleShot(0, this, TQT_SLOT(done())); } } -void Task::send(const QDomElement &x) +void Task::send(const TQDomElement &x) { client()->send(x); } -void Task::setSuccess(int code, const QString &str) +void Task::setSuccess(int code, const TQString &str) { if(!d->done) { d->success = true; @@ -1294,7 +1294,7 @@ void Task::setSuccess(int code, const QString &str) } } -void Task::setError(const QDomElement &e) +void Task::setError(const TQDomElement &e) { if(!d->done) { d->success = false; @@ -1303,7 +1303,7 @@ void Task::setError(const QDomElement &e) } } -void Task::setError(int code, const QString &str) +void Task::setError(int code, const TQString &str) { if(!d->done) { d->success = false; @@ -1338,7 +1338,7 @@ void Task::clientDisconnected() void Task::debug(const char *fmt, ...) { char *buf; - QString str; + TQString str; int size = 1024; int r; @@ -1350,7 +1350,7 @@ void Task::debug(const char *fmt, ...) va_end(ap); if(r != -1) - str = QString(buf); + str = TQString(buf); delete [] buf; @@ -1360,12 +1360,12 @@ void Task::debug(const char *fmt, ...) debug(str); } -void Task::debug(const QString &str) +void Task::debug(const TQString &str) { - client()->debug(QString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } -bool Task::iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns) +bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) { if(x.tagName() != "iq") return false; @@ -1485,7 +1485,7 @@ void LiveRosterItem::setFlagForDelete(bool b) // LiveRoster //--------------------------------------------------------------------------- LiveRoster::LiveRoster() -:QValueList<LiveRosterItem>() +:TQValueList<LiveRosterItem>() { } |