From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/protocols/jabber/libiris/iris/include/im.h | 36 ++++----- .../jabber/libiris/iris/xmpp-core/parser.cpp | 2 +- .../jabber/libiris/iris/xmpp-core/protocol.cpp | 8 +- .../jabber/libiris/iris/xmpp-core/stream.cpp | 6 +- .../jabber/libiris/iris/xmpp-core/xmlprotocol.cpp | 2 +- .../jabber/libiris/iris/xmpp-im/client.cpp | 88 +++++++++++----------- .../jabber/libiris/iris/xmpp-im/types.cpp | 76 +++++++++---------- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp | 24 +++--- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.h | 12 +-- 9 files changed, 127 insertions(+), 127 deletions(-) (limited to 'kopete/protocols/jabber/libiris/iris') diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 835eed62..8387d48a 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -136,11 +136,11 @@ namespace XMPP SubType value; }; - class Status + class tqStatus { public: - Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true); - ~Status(); + tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true); + ~tqStatus(); int priority() const; const TQString & show() const; @@ -162,7 +162,7 @@ namespace XMPP void setPriority(int); void setShow(const TQString &); - void setStatus(const TQString &); + void settqStatus(const TQString &); void setTimeStamp(const TQDateTime &); void setKeyID(const TQString &); void setIsAvailable(bool); @@ -197,19 +197,19 @@ namespace XMPP class Resource { public: - Resource(const TQString &name="", const Status &s=Status()); + Resource(const TQString &name="", const tqStatus &s=tqStatus()); ~Resource(); const TQString & name() const; int priority() const; - const Status & status() const; + const tqStatus & status() const; void setName(const TQString &); - void setStatus(const Status &); + void settqStatus(const tqStatus &); private: TQString v_name; - Status v_status; + tqStatus v_status; class ResourcePrivate *d; }; @@ -570,7 +570,7 @@ namespace XMPP void rosterRequest(); void sendMessage(const Message &); void sendSubscription(const Jid &, const TQString &); - void setPresence(const Status &); + void setPresence(const tqStatus &); void debug(const TQString &); TQString genUniqueId(); @@ -610,8 +610,8 @@ namespace XMPP bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick); bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password); - void groupChatSetStatus(const TQString &host, const TQString &room, const Status &); - void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &); + void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &); + void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &); void groupChatLeave(const TQString &host, const TQString &room); signals: @@ -632,7 +632,7 @@ namespace XMPP void xmlOutgoing(const TQString &); void groupChatJoined(const Jid &); void groupChatLeft(const Jid &); - void groupChatPresence(const Jid &, const Status &); + void groupChatPresence(const Jid &, const tqStatus &); void groupChatError(const Jid &, int, const TQString &); void incomingJidLink(); @@ -652,7 +652,7 @@ namespace XMPP // basic daemons void ppSubscription(const Jid &, const TQString &); - void ppPresence(const Jid &, const Status &); + void ppPresence(const Jid &, const tqStatus &); void pmMessage(const Message &); void prRoster(const Roster &); @@ -666,8 +666,8 @@ namespace XMPP void distribute(const TQDomElement &); void importRoster(const Roster &); void importRosterItem(const RosterItem &); - void updateSelfPresence(const Jid &, const Status &); - void updatePresence(LiveRosterItem *, const Jid &, const Status &); + void updateSelfPresence(const Jid &, const tqStatus &); + void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &); class ClientPrivate; ClientPrivate *d; @@ -689,15 +689,15 @@ namespace XMPP ResourceList::ConstIterator priority() const; bool isAvailable() const; - const Status & lastUnavailableStatus() const; + const tqStatus & lastUnavailabletqStatus() const; bool flagForDelete() const; - void setLastUnavailableStatus(const Status &); + void setLastUnavailabletqStatus(const tqStatus &); void setFlagForDelete(bool); private: ResourceList v_resourceList; - Status v_lastUnavailableStatus; + tqStatus v_lastUnavailabletqStatus; bool v_flagForDelete; class LiveRosterItemPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index edd2398b..3fa7d6c3 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -49,7 +49,7 @@ #include"parser.h" -#include +#include #include #include diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index f96fd795..89c98a91 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) e.setAttribute("mechanism", sasl_mech); if(!sasl_step.isEmpty()) { #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); #endif e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step))); } @@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) else { TQByteArray stepData = sasl_step; #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); #endif TQDomElement e = doc.createElementNS(NS_SASL, "response"); if(!stepData.isEmpty()) @@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) #ifdef XMPP_TEST TQString s = "SASL mechs:"; for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it) - s += TQString(" [%1]").arg((*it)); + s += TQString(" [%1]").tqarg((*it)); TD::msg(s); #endif } @@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) if(e.tagName() == "challenge") { TQByteArray a = Base64::stringToArray(e.text()); #ifdef XMPP_TEST - TD::msg(TQString("SASL IN: [%1]").arg(printArray(a))); + TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a))); #endif sasl_step = a; need = NSASLNext; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index c2f3083e..0e324cb1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -44,7 +44,7 @@ #include"xmpp.h" -#include +#include #include #include #include @@ -1358,9 +1358,9 @@ void ClientStream::processNext() #endif #ifdef XMPP_TEST - TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang); + TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang); if(!d->client.from.isEmpty()) - s += TQString(", from=[%1]").arg(d->client.from); + s += TQString(", from=[%1]").tqarg(d->client.from); s += ')'; TD::msg(s); #endif diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 93748aa8..d1650842 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e) i.setAttributeNodeNS(a); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index b7d5e00c..973b6c73 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->pass = pass; d->resource = _resource; - Status stat; + tqStatus stat; stat.setIsAvailable(false); d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); 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 &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); @@ -267,7 +267,7 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s) { Jid jid(room + "@" + host + "/" + nick); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con if(i.j.compare(jid, false)) { i.j = jid; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -303,14 +303,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_Presence *j = new JT_Presence(rootTask()); - j->pres(jid, Status()); + j->pres(jid, tqStatus()); j->go(true); return true; @@ -332,20 +332,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_MucPresence *j = new JT_MucPresence(rootTask()); - j->pres(jid, Status(), password); + j->pres(jid, tqStatus(), password); j->go(true); return true; } -void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) +void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s) { Jid jid(room + "@" + host); bool found = false; @@ -360,7 +360,7 @@ void Client::groupChatSetStatus(const TQString &host, const TQString &room, cons if(!found) return; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -378,10 +378,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) continue; i.status = GroupChat::Closing; - debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -410,7 +410,7 @@ void Client::close(bool) i.status = GroupChat::Closing; JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -514,7 +514,7 @@ void Client::streamReadyRead() Stanza s = d->stream->read(); TQString out = s.toString(); - debug(TQString("Client: incoming: [\n%1]\n").arg(out)); + debug(TQString("Client: incoming: [\n%1]\n").tqarg(out)); xmlIncoming(out); TQDomElement x = oldStyleNS(s.element()); @@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(a.cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x) //x.save(ts, 0); //TQString out = Stream::xmlToString(x); - //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); //xmlOutgoing(out); TQDomElement e = addCorrectNS(x); @@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x) } TQString out = s.toString(); - debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); @@ -654,7 +654,7 @@ void Client::send(const TQString &str) if(!d->stream) return; - debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str)); xmlOutgoing(str); static_cast(d->stream)->writeDirect(str); } @@ -713,12 +713,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s) subscription(j, s); } -void Client::ppPresence(const Jid &j, const Status &s) +void Client::ppPresence(const Jid &j, const tqStatus &s) { if(s.isAvailable()) - debug(TQString("Client: %1 is available.\n").arg(j.full())); + debug(TQString("Client: %1 is available.\n").tqarg(j.full())); else - debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full())); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; @@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const Status &s) if(i.j.compare(j, false)) { bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false; - debug(TQString("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").tqarg(i.j.full()).tqarg(j.full()).tqarg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const Status &s) } } -void Client::updateSelfPresence(const Jid &j, const Status &s) +void Client::updateSelfPresence(const Jid &j, const tqStatus &s) { ResourceList::Iterator rit = d->resourceList.find(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; @@ -797,8 +797,8 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); - (*rit).setStatus(s); + debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); + (*rit).settqStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); } @@ -809,19 +809,19 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); } resourceAvailable(j, r); } } -void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) +void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) { ResourceList::Iterator rit = i->resourceList().find(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; @@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - (*rit).setStatus(s); - debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + (*rit).settqStatus(s); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); - i->setLastUnavailableStatus(s); + i->setLastUnavailabletqStatus(s); } } // available? add/update the resource @@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(TQString("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").tqarg(i->jid().full()).tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("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").tqarg(i->jid().full()).tqarg(j.resource())); } resourceAvailable(j, r); @@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(TQString("Client: Message from %1\n").arg(m.from().full())); + debug(TQString("Client: Message from %1\n").tqarg(m.from().full())); if(m.type() == "groupchat") { for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type) j->go(true); } -void Client::setPresence(const Status &s) +void Client::setPresence(const tqStatus &s) { JT_Presence *j = new JT_Presence(rootTask()); j->pres(s); @@ -1004,7 +1004,7 @@ void Client::setPresence(const Status &s) ppPresence(jid(), s); //ResourceList::Iterator rit = d->resourceList.find(resource()); //Resource &r = *rit; - //r.setStatus(s); + //r.settqStatus(s); } TQString Client::OSName() const @@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...) void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) @@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const return false; } -const Status & LiveRosterItem::lastUnavailableStatus() const +const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const { - return v_lastUnavailableStatus; + return v_lastUnavailabletqStatus; } bool LiveRosterItem::flagForDelete() const @@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const return v_flagForDelete; } -void LiveRosterItem::setLastUnavailableStatus(const Status &s) +void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s) { - v_lastUnavailableStatus = s; + v_lastUnavailabletqStatus = s; } void LiveRosterItem::setFlagForDelete(bool b) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index f33e428f..9e742d10 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -295,7 +295,7 @@ Stanza::Error Message::error() const return d->error; } -//! \brief Set receivers information +//! \brief Set tqreceivers information //! //! \param to - Receivers Jabber id void Message::setTo(const Jid &j) @@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) d->spooled = true; } else { - d->timeStamp = TQDateTime::currentDateTime(); + d->timeStamp = TQDateTime::tqcurrentDateTime(); d->spooled = false; } @@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s) //--------------------------------------------------------------------------- -// Status +// tqStatus //--------------------------------------------------------------------------- -Status::Status(const TQString &show, const TQString &status, int priority, bool available) +tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available) { v_isAvailable = available; v_show = show; v_status = status; v_priority = priority; - v_timeStamp = TQDateTime::currentDateTime(); + v_timeStamp = TQDateTime::tqcurrentDateTime(); v_isInvisible = false; ecode = -1; } -Status::~Status() +tqStatus::~tqStatus() { } -bool Status::hasError() const +bool tqStatus::hasError() const { return (ecode != -1); } -void Status::setError(int code, const TQString &str) +void tqStatus::setError(int code, const TQString &str) { ecode = code; estr = str; } -void Status::setIsAvailable(bool available) +void tqStatus::setIsAvailable(bool available) { v_isAvailable = available; } -void Status::setIsInvisible(bool invisible) +void tqStatus::setIsInvisible(bool invisible) { v_isInvisible = invisible; } -void Status::setPriority(int x) +void tqStatus::setPriority(int x) { v_priority = x; } -void Status::setShow(const TQString & _show) +void tqStatus::setShow(const TQString & _show) { v_show = _show; } -void Status::setStatus(const TQString & _status) +void tqStatus::settqStatus(const TQString & _status) { v_status = _status; } -void Status::setTimeStamp(const TQDateTime & _timestamp) +void tqStatus::setTimeStamp(const TQDateTime & _timestamp) { v_timeStamp = _timestamp; } -void Status::setKeyID(const TQString &key) +void tqStatus::setKeyID(const TQString &key) { v_key = key; } -void Status::setXSigned(const TQString &s) +void tqStatus::setXSigned(const TQString &s) { v_xsigned = s; } -void Status::setSongTitle(const TQString & _songtitle) +void tqStatus::setSongTitle(const TQString & _songtitle) { v_songTitle = _songtitle; } -void Status::setCapsNode(const TQString & _capsNode) +void tqStatus::setCapsNode(const TQString & _capsNode) { v_capsNode = _capsNode; } -void Status::setCapsVersion(const TQString & _capsVersion) +void tqStatus::setCapsVersion(const TQString & _capsVersion) { v_capsVersion = _capsVersion; } -void Status::setCapsExt(const TQString & _capsExt) +void tqStatus::setCapsExt(const TQString & _capsExt) { v_capsExt = _capsExt; } -bool Status::isAvailable() const +bool tqStatus::isAvailable() const { return v_isAvailable; } -bool Status::isAway() const +bool tqStatus::isAway() const { if(v_show == "away" || v_show == "xa" || v_show == "dnd") return true; @@ -902,66 +902,66 @@ bool Status::isAway() const return false; } -bool Status::isInvisible() const +bool tqStatus::isInvisible() const { return v_isInvisible; } -int Status::priority() const +int tqStatus::priority() const { return v_priority; } -const TQString & Status::show() const +const TQString & tqStatus::show() const { return v_show; } -const TQString & Status::status() const +const TQString & tqStatus::status() const { return v_status; } -TQDateTime Status::timeStamp() const +TQDateTime tqStatus::timeStamp() const { return v_timeStamp; } -const TQString & Status::keyID() const +const TQString & tqStatus::keyID() const { return v_key; } -const TQString & Status::xsigned() const +const TQString & tqStatus::xsigned() const { return v_xsigned; } -const TQString & Status::songTitle() const +const TQString & tqStatus::songTitle() const { return v_songTitle; } -const TQString & Status::capsNode() const +const TQString & tqStatus::capsNode() const { return v_capsNode; } -const TQString & Status::capsVersion() const +const TQString & tqStatus::capsVersion() const { return v_capsVersion; } -const TQString & Status::capsExt() const +const TQString & tqStatus::capsExt() const { return v_capsExt; } -int Status::errorCode() const +int tqStatus::errorCode() const { return ecode; } -const TQString & Status::errorString() const +const TQString & tqStatus::errorString() const { return estr; } @@ -970,7 +970,7 @@ const TQString & Status::errorString() const //--------------------------------------------------------------------------- // Resource //--------------------------------------------------------------------------- -Resource::Resource(const TQString &name, const Status &stat) +Resource::Resource(const TQString &name, const tqStatus &stat) { v_name = name; v_status = stat; @@ -990,7 +990,7 @@ int Resource::priority() const return v_status.priority(); } -const Status & Resource::status() const +const tqStatus & Resource::status() const { return v_status; } @@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name) v_name = _name; } -void Resource::setStatus(const Status & _status) +void Resource::settqStatus(const tqStatus & _status) { v_status = _status; } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index edc8762e..89d66796 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -485,7 +485,7 @@ JT_Presence::~JT_Presence() { } -void JT_Presence::pres(const Status &s) +void JT_Presence::pres(const tqStatus &s) { type = 0; @@ -504,7 +504,7 @@ void JT_Presence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -529,7 +529,7 @@ void JT_Presence::pres(const Status &s) } } -void JT_Presence::pres(const Jid &to, const Status &s) +void JT_Presence::pres(const Jid &to, const tqStatus &s) { pres(s); tag.setAttribute("to", to.full()); @@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e) return false; Jid j(e.attribute("from")); - Status p; + tqStatus p; if(e.hasAttribute("type")) { TQString type = e.attribute("type"); @@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e) tag = findSubTag(e, "status", &found); if(found) - p.setStatus(tagContent(tag)); + p.settqStatus(tagContent(tag)); tag = findSubTag(e, "show", &found); if(found) p.setShow(tagContent(tag)); @@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(al.item(x).cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -1338,12 +1338,12 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQDomElement query = doc()->createElement("query"); // query.setAttribute("xmlns", "jabber:iq:time"); // iq.appendChild(query); - // TQDateTime local = TQDateTime::currentDateTime(); + // TQDateTime local = TQDateTime::tqcurrentDateTime(); // TQDateTime utc = local.addSecs(-getTZOffset() * 3600); // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); // query.appendChild(textTag("tz", str)); - // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str))); + // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str))); // send(iq); // return TRUE; //} @@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence() { } -void JT_MucPresence::pres(const Status &s) +void JT_MucPresence::pres(const tqStatus &s) { type = 0; @@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const Status &s) } } -void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password) +void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password) { pres(s); tag.setAttribute("to", to.full()); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h index 0a1fdac5..9a8041e9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -30,7 +30,7 @@ namespace XMPP { class Roster; - class Status; + class tqStatus; class JT_Register : public Task { @@ -135,8 +135,8 @@ namespace XMPP JT_Presence(Task *parent); ~JT_Presence(); - void pres(const Status &); - void pres(const Jid &, const Status &); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &); void sub(const Jid &, const TQString &subType); void onGo(); @@ -160,7 +160,7 @@ namespace XMPP bool take(const TQDomElement &); signals: - void presence(const Jid &, const Status &); + void presence(const Jid &, const tqStatus &); void subscription(const Jid &, const TQString &); private: @@ -468,8 +468,8 @@ namespace XMPP JT_MucPresence(Task *parent); ~JT_MucPresence(); - void pres(const Status &); - void pres(const Jid &, const Status &, const TQString &password); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &, const TQString &password); void onGo(); -- cgit v1.2.1