summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/iris
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris')
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp8
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp4
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp40
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp10
6 files changed, 33 insertions, 33 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 89c98a91..f96fd795 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]").tqarg(printArray(sasl_step)));
+ TD::msg(TQString("SASL OUT: [%1]").arg(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]").tqarg(printArray(sasl_step)));
+ TD::msg(TQString("SASL OUT: [%1]").arg(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]").tqarg((*it));
+ s += TQString(" [%1]").arg((*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]").tqarg(printArray(a)));
+ TD::msg(TQString("SASL IN: [%1]").arg(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 0e324cb1..51041c1d 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -1358,9 +1358,9 @@ void ClientStream::processNext()
#endif
#ifdef XMPP_TEST
- TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang);
+ TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang);
if(!d->client.from.isEmpty())
- s += TQString(", from=[%1]").tqarg(d->client.from);
+ s += TQString(", from=[%1]").arg(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 d1650842..93748aa8 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 tqchildren
+ // copy children
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 69737a24..b7d5e00c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -303,7 +303,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
++it;
}
- debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+ debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
GroupChat i;
i.j = jid;
i.status = GroupChat::Connecting;
@@ -332,7 +332,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
++it;
}
- debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+ debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
GroupChat i;
i.j = jid;
i.status = GroupChat::Connecting;
@@ -378,7 +378,7 @@ void Client::groupChatLeave(const TQString &host, const TQString &room)
continue;
i.status = GroupChat::Closing;
- debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full()));
+ debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full()));
JT_Presence *j = new JT_Presence(rootTask());
Status s;
@@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
if(!noShowNS)
i.setAttribute("xmlns", e.namespaceURI());
- // copy tqchildren
+ // copy children
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").tqarg(out));
+ debug(TQString("Client: incoming: [\n%1]\n").arg(out));
xmlIncoming(out);
TQDomElement x = oldStyleNS(s.element());
@@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
i.setAttributeNodeNS(a.cloneNode().toAttr());
}
- // copy tqchildren
+ // copy children
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").tqarg(out));
+ //debug(TQString("Client: outgoing: [\n%1]\n").arg(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").tqarg(out));
+ 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());
@@ -654,7 +654,7 @@ void Client::send(const TQString &str)
if(!d->stream)
return;
- debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str));
+ debug(TQString("Client: outgoing: [\n%1]\n").arg(str));
xmlOutgoing(str);
static_cast<ClientStream*>(d->stream)->writeDirect(str);
}
@@ -716,9 +716,9 @@ void Client::ppSubscription(const Jid &j, const TQString &s)
void Client::ppPresence(const Jid &j, const Status &s)
{
if(s.isAvailable())
- debug(TQString("Client: %1 is available.\n").tqarg(j.full()));
+ debug(TQString("Client: %1 is available.\n").arg(j.full()));
else
- debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full()));
+ debug(TQString("Client: %1 is unavailable.\n").arg(j.full()));
for(TQValueList<GroupChat>::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").tqarg(i.j.full()).tqarg(j.full()).tqarg(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()) {
@@ -797,7 +797,7 @@ 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").tqarg(j.resource()));
+ debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource()));
(*rit).setStatus(s);
resourceUnavailable(j, *rit);
d->resourceList.remove(rit);
@@ -809,12 +809,12 @@ 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").tqarg(j.resource()));
+ debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource()));
}
else {
(*rit).setStatus(s);
r = *rit;
- debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource()));
+ debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource()));
}
resourceAvailable(j, r);
@@ -830,7 +830,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
if(!s.isAvailable()) {
if(found) {
(*rit).setStatus(s);
- debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(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);
@@ -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").tqarg(i->jid().full()).tqarg(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(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+ debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(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").tqarg(m.from().full()));
+ debug(TQString("Client: Message from %1\n").arg(m.from().full()));
if(m.type() == "groupchat") {
for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...)
void Task::debug(const TQString &str)
{
- client()->debug(TQString("%1: ").tqarg(className()) + str);
+ client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 5700c343..f33e428f 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 tqreceivers information
+//! \brief Set receivers information
//!
//! \param to - Receivers Jabber id
void Message::setTo(const Jid &j)
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 c6e05909..edc8762e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -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").tqarg(s.priority()) ) );
+ tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
if(!s.keyID().isEmpty()) {
TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
if(!noShowNS)
i.setAttribute("xmlns", e.namespaceURI());
- // copy tqchildren
+ // copy children
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 tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
@@ -1343,7 +1343,7 @@ bool JT_ServInfo::take(const TQDomElement &e)
// TQString str = getTZString();
// query.appendChild(textTag("utc", TS2stamp(utc)));
// query.appendChild(textTag("tz", str));
- // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str)));
+ // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str)));
// send(iq);
// return TRUE;
//}
@@ -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").tqarg(s.priority()) ) );
+ tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
if(!s.keyID().isEmpty()) {
TQDomElement x = textTag(doc(), "x", s.keyID());