diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/libiris/jingle_iris.patch | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip | |
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
Diffstat (limited to 'kopete/protocols/jabber/libiris/jingle_iris.patch')
| -rw-r--r-- | kopete/protocols/jabber/libiris/jingle_iris.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 41acad0e..2fcf782b 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.contains(ext)) { ++ if (d->extension_features.tqcontains(ext)) { + d->extension_features.remove(ext); + d->capsExt = extensions().join(" "); + } @@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp v_songTitle = _songtitle; } -+void Status::setCapsNode(const QString & _capsNode) ++void tqStatus::setCapsNode(const QString & _capsNode) +{ + v_capsNode = _capsNode; +} + -+void Status::setCapsVersion(const QString & _capsVersion) ++void tqStatus::setCapsVersion(const QString & _capsVersion) +{ + v_capsVersion = _capsVersion; +} + -+void Status::setCapsExt(const QString & _capsExt) ++void tqStatus::setCapsExt(const QString & _capsExt) +{ + v_capsExt = _capsExt; +} + - bool Status::isAvailable() const + bool tqStatus::isAvailable() const { return v_isAvailable; @@ -836,6 +851,21 @@ return v_songTitle; } -+const QString & Status::capsNode() const ++const QString & tqStatus::capsNode() const +{ + return v_capsNode; +} + -+const QString & Status::capsVersion() const ++const QString & tqStatus::capsVersion() const +{ + return v_capsVersion; +} + -+const QString & Status::capsExt() const ++const QString & tqStatus::capsExt() const +{ + return v_capsExt; +} + - int Status::errorCode() const + int tqStatus::errorCode() const { return ecode; @@ -1427,6 +1457,15 @@ @@ -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().contains(ext)) { ++ if (client()->extensions().tqcontains(ext)) { + const QStringList& l = client()->extension(ext).list(); + for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + feature = doc()->createElement("feature"); |