summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/libiris')
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp4
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp10
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp10
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/im.h12
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp10
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp10
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp12
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp16
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp18
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp8
-rw-r--r--kopete/protocols/jabber/libiris/jingle_iris.patch4
14 files changed, 62 insertions, 62 deletions
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
index 2064e4ab..ca3b804c 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
@@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found)
static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg)
{
- int n = line.tqfind(' ');
+ int n = line.find(' ');
if(n == -1)
return false;
if(proto)
*proto = line.mid(0, n);
++n;
- int n2 = line.tqfind(' ', n);
+ int n2 = line.find(' ', n);
if(n2 == -1)
return false;
if(code)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 2e6d0779..fbc9a39f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -229,14 +229,14 @@ void HttpPoll::http_result()
// get id and packet
TQString id;
TQString cookie = d->http.getHeader("Set-Cookie");
- int n = cookie.tqfind("ID=");
+ int n = cookie.find("ID=");
if(n == -1) {
reset();
error(ErrRead);
return;
}
n += 3;
- int n2 = cookie.tqfind(';', n);
+ int n2 = cookie.find(';', n);
if(n2 != -1)
id = cookie.mid(n, n2-n);
else
@@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found)
static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg)
{
- int n = line.tqfind(' ');
+ int n = line.find(' ');
if(n == -1)
return false;
if(proto)
*proto = line.mid(0, n);
++n;
- int n2 = line.tqfind(' ', n);
+ int n2 = line.find(' ', n);
if(n2 == -1)
return false;
if(code)
@@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const
{
for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) {
const TQString &s = *it;
- int n = s.tqfind(": ");
+ int n = s.find(": ");
if(n == -1)
continue;
TQString v = s.mid(0, n);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
index 39fbfdda..b94399ce 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
@@ -116,7 +116,7 @@ public:
class NDnsManager::Private
{
public:
- Item *tqfind(const NDns *n)
+ Item *find(const NDns *n)
{
TQPtrListIterator<Item> it(list);
for(Item *i; (i = it.current()); ++it) {
@@ -126,7 +126,7 @@ public:
return 0;
}
- Item *tqfind(const NDnsWorker *w)
+ Item *find(const NDnsWorker *w)
{
TQPtrListIterator<Item> it(list);
for(Item *i; (i = it.current()); ++it) {
@@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name)
void NDnsManager::stop(NDns *self)
{
- Item *i = d->tqfind(self);
+ Item *i = d->find(self);
if(!i)
return;
// disassociate
@@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self)
bool NDnsManager::isBusy(const NDns *self) const
{
- Item *i = d->tqfind(self);
+ Item *i = d->find(self);
return (i ? true: false);
}
@@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e)
NDnsWorkerEvent *we = static_cast<NDnsWorkerEvent*>(e);
we->worker->wait(); // ensure that the thread is terminated
- Item *i = d->tqfind(we->worker);
+ Item *i = d->find(we->worker);
if(!i) {
// should NOT happen
return true;
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 12b9ad55..3e52c5d2 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -220,10 +220,10 @@ namespace XMPP
ResourceList();
~ResourceList();
- ResourceList::Iterator tqfind(const TQString &);
+ ResourceList::Iterator find(const TQString &);
ResourceList::Iterator priority();
- ResourceList::ConstIterator tqfind(const TQString &) const;
+ ResourceList::ConstIterator find(const TQString &) const;
ResourceList::ConstIterator priority() const;
private:
@@ -273,8 +273,8 @@ namespace XMPP
Roster();
~Roster();
- Roster::Iterator tqfind(const Jid &);
- Roster::ConstIterator tqfind(const Jid &) const;
+ Roster::Iterator find(const Jid &);
+ Roster::ConstIterator find(const Jid &) const;
private:
class RosterPrivate *d;
@@ -711,8 +711,8 @@ namespace XMPP
~LiveRoster();
void flagAllForDelete();
- LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true);
- LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const;
+ LiveRoster::Iterator find(const Jid &, bool compareRes=true);
+ LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
private:
class LiveRosterPrivate;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
index 90cf1364..090cc9df 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
@@ -42,7 +42,7 @@ public:
StringPrepCache *that = get_instance();
- Result *r = that->nameprep_table.tqfind(in);
+ Result *r = that->nameprep_table.find(in);
if(r)
{
if(!r->norm)
@@ -78,7 +78,7 @@ public:
StringPrepCache *that = get_instance();
- Result *r = that->nodeprep_table.tqfind(in);
+ Result *r = that->nodeprep_table.find(in);
if(r)
{
if(!r->norm)
@@ -114,7 +114,7 @@ public:
StringPrepCache *that = get_instance();
- Result *r = that->resourceprep_table.tqfind(in);
+ Result *r = that->resourceprep_table.find(in);
if(r)
{
if(!r->norm)
@@ -248,7 +248,7 @@ void Jid::set(const TQString &s)
{
TQString rest, domain, node, resource;
TQString norm_domain, norm_node, norm_resource;
- int x = s.tqfind('/');
+ int x = s.find('/');
if(x != -1) {
rest = s.mid(0, x);
resource = s.mid(x+1);
@@ -262,7 +262,7 @@ void Jid::set(const TQString &s)
return;
}
- x = rest.tqfind('@');
+ x = rest.find('@');
if(x != -1) {
node = rest.mid(0, x);
domain = rest.mid(x+1);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 80ce5366..3fa7d6c3 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -232,10 +232,10 @@ private:
if(mightChangeEncoding) {
while(1) {
- int n = out.tqfind('<');
+ int n = out.find('<');
if(n != -1) {
// we need a closing bracket
- int n2 = out.tqfind('>', n);
+ int n2 = out.find('>', n);
if(n2 != -1) {
++n2;
TQString h = out.mid(n, n2-n);
@@ -278,8 +278,8 @@ private:
if(h.left(5) != "<?xml")
return "";
- int endPos = h.tqfind(">");
- int startPos = h.tqfind("encoding");
+ int endPos = h.find(">");
+ int startPos = h.find("encoding");
if(startPos < endPos && startPos != -1) {
TQString encoding;
do {
@@ -335,7 +335,7 @@ private:
bool checkForBadChars(const TQString &s)
{
- int len = s.tqfind('<');
+ int len = s.find('<');
if(len == -1)
len = s.length();
else
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 5a6bc64f..89c98a91 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe)
int minor = 0;
TQString verstr = atts.value("version");
if(!verstr.isEmpty()) {
- int n = verstr.tqfind('.');
+ int n = verstr.find('.');
if(n != -1) {
major = verstr.mid(0, n).toInt();
minor = verstr.mid(n+1).toInt();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
index da78fef1..c825a2ca 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
@@ -78,7 +78,7 @@ public:
PropList list;
int at = 0;
while(1) {
- int n = str.tqfind('=', at);
+ int n = str.find('=', at);
if(n == -1)
break;
TQCString var, val;
@@ -86,14 +86,14 @@ public:
at = n + 1;
if(str[at] == '\"') {
++at;
- n = str.tqfind('\"', at);
+ n = str.find('\"', at);
if(n == -1)
break;
val = str.mid(at, n-at);
at = n + 1;
}
else {
- n = str.tqfind(',', at);
+ n = str.find(',', at);
if(n != -1) {
val = str.mid(at, n-at);
at = n;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index fe7275ad..59b28f8b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &)
// printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
//#endif
TQString u = user;
- int n = u.tqfind('@');
+ int n = u.find('@');
if(n != -1)
u.truncate(n);
d->srv.user = u;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index 5f682371..91111ea9 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const
}
// 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline
if(clip) {
- int n = out.tqfindRev('>');
+ int n = out.findRev('>');
out.truncate(n+1);
}
return out;
@@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS
}
// parse the tags out
- int n = str.tqfind('<');
- int n2 = str.tqfind('>', n);
+ int n = str.find('<');
+ int n2 = str.find('>', n);
++n2;
*tagOpen = str.mid(n, n2-n);
- n2 = str.tqfindRev('>');
- n = str.tqfindRev('<');
+ n2 = str.findRev('>');
+ n = str.findRev('<');
++n2;
*tagClose = str.mid(n, n2-n);
@@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip)
for(n = 0; n < al.count(); ++n) {
TQDomAttr a = al.item(n).toAttr();
TQString s = a.name();
- int x = s.tqfind(':');
+ int x = s.find(':');
if(x != -1)
s = s.mid(x+1);
else
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 86a01e60..7b425696 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -790,7 +790,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
{
- ResourceList::Iterator rit = d->resourceList.tqfind(j.resource());
+ ResourceList::Iterator rit = d->resourceList.find(j.resource());
bool found = (rit == d->resourceList.end()) ? false: true;
// unavailable? remove the resource
@@ -822,7 +822,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
{
- ResourceList::Iterator rit = i->resourceList().tqfind(j.resource());
+ ResourceList::Iterator rit = i->resourceList().find(j.resource());
bool found = (rit == i->resourceList().end()) ? false: true;
// unavailable? remove the resource
@@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item)
// Remove
if(item.subscription().type() == Subscription::Remove) {
- LiveRoster::Iterator it = d->roster.tqfind(item.jid());
+ LiveRoster::Iterator it = d->roster.find(item.jid());
if(it != d->roster.end()) {
rosterItemRemoved(*it);
d->roster.remove(it);
@@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item)
}
// Add/Update
else {
- LiveRoster::Iterator it = d->roster.tqfind(item.jid());
+ LiveRoster::Iterator it = d->roster.find(item.jid());
if(it != d->roster.end()) {
LiveRosterItem &i = *it;
i.setFlagForDelete(false);
@@ -1001,7 +1001,7 @@ void Client::setPresence(const tqStatus &s)
// update our resourceList
ppPresence(jid(), s);
- //ResourceList::Iterator rit = d->resourceList.tqfind(resource());
+ //ResourceList::Iterator rit = d->resourceList.find(resource());
//Resource &r = *rit;
//r.settqStatus(s);
}
@@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features)
void Client::removeExtension(const TQString& ext)
{
- if (d->extension_features.tqcontains(ext)) {
+ if (d->extension_features.contains(ext)) {
d->extension_features.remove(ext);
d->capsExt = extensions().join(" ");
}
@@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete()
(*it).setFlagForDelete(true);
}
-LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes)
+LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes)
{
Iterator it;
for(it = begin(); it != end(); ++it) {
@@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes)
return it;
}
-LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const
+LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const
{
ConstIterator it;
for(it = begin(); it != end(); ++it) {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index fb9de2e8..522e52f9 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -421,12 +421,12 @@ bool Message::containsEvents() const
bool Message::containsEvent(MsgEvent e) const
{
- return d->eventList.tqcontains(e);
+ return d->eventList.contains(e);
}
void Message::addEvent(MsgEvent e)
{
- if (!d->eventList.tqcontains(e)) {
+ if (!d->eventList.contains(e)) {
if (e == CancelEvent || containsEvent(CancelEvent))
d->eventList.clear(); // Reset list
d->eventList += e;
@@ -1018,10 +1018,10 @@ ResourceList::~ResourceList()
{
}
-ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind)
+ResourceList::Iterator ResourceList::find(const TQString & _find)
{
for(ResourceList::Iterator it = begin(); it != end(); ++it) {
- if((*it).name() == _tqfind)
+ if((*it).name() == _find)
return it;
}
@@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority()
return highest;
}
-ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const
+ResourceList::ConstIterator ResourceList::find(const TQString & _find) const
{
for(ResourceList::ConstIterator it = begin(); it != end(); ++it) {
- if((*it).name() == _tqfind)
+ if((*it).name() == _find)
return it;
}
@@ -1222,7 +1222,7 @@ Roster::~Roster()
{
}
-Roster::Iterator Roster::tqfind(const Jid &j)
+Roster::Iterator Roster::find(const Jid &j)
{
for(Roster::Iterator it = begin(); it != end(); ++it) {
if((*it).jid().compare(j))
@@ -1232,7 +1232,7 @@ Roster::Iterator Roster::tqfind(const Jid &j)
return end();
}
-Roster::ConstIterator Roster::tqfind(const Jid &j) const
+Roster::ConstIterator Roster::find(const Jid &j) const
{
for(Roster::ConstIterator it = begin(); it != end(); ++it) {
if((*it).jid().compare(j))
@@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const
{
TQStringList::ConstIterator it = ns.begin();
for ( ; it != ns.end(); ++it)
- if ( _list.tqfind( *it ) != _list.end() )
+ if ( _list.find( *it ) != _list.end() )
return true;
return false;
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 bab5665b..45ef7a04 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -35,9 +35,9 @@ using namespace XMPP;
static TQString lineEncode(TQString str)
{
- str.tqreplace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash
- str.tqreplace(TQRegExp("\\|"), "\\p"); // pipe to \p
- str.tqreplace(TQRegExp("\n"), "\\n"); // newline to \n
+ str.replace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash
+ str.replace(TQRegExp("\\|"), "\\p"); // pipe to \p
+ str.replace(TQRegExp("\n"), "\\n"); // newline to \n
return str;
}
@@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e)
}
else if (node.startsWith(client()->capsNode() + "#")) {
TQString ext = node.right(node.length()-client()->capsNode().length()-1);
- if (client()->extensions().tqcontains(ext)) {
+ if (client()->extensions().contains(ext)) {
const TQStringList& l = client()->extension(ext).list();
for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
feature = doc()->createElement("feature");
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 2fcf782b..489afab4 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp
+
+void Client::removeExtension(const QString& ext)
+{
-+ if (d->extension_features.tqcontains(ext)) {
++ if (d->extension_features.contains(ext)) {
+ d->extension_features.remove(ext);
+ d->capsExt = extensions().join(" ");
+ }
@@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp
+ }
+ else if (node.startsWith(client()->capsNode() + "#")) {
+ QString ext = node.right(node.length()-client()->capsNode().length()-1);
-+ if (client()->extensions().tqcontains(ext)) {
++ if (client()->extensions().contains(ext)) {
+ const QStringList& l = client()->extension(ext).list();
+ for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
+ feature = doc()->createElement("feature");