summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/jingle_iris.patch
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-18 18:33:51 -0600
committerSlávek Banko <[email protected]>2012-06-03 15:53:28 +0200
commit4b54ad17739d1075235f2960ecde230a58b5621c (patch)
tree041d34c2e70d106209f97f8607698ccfe907c9b4 /kopete/protocols/jabber/libiris/jingle_iris.patch
parent6f21bc7511005a69a8ef14c2ad4e74857baf59f3 (diff)
downloadtdenetwork-4b54ad17739d1075235f2960ecde230a58b5621c.tar.gz
tdenetwork-4b54ad17739d1075235f2960ecde230a58b5621c.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit 089118c18533dfa3e6ce5065dbebdd4db94051f1)
Diffstat (limited to 'kopete/protocols/jabber/libiris/jingle_iris.patch')
-rw-r--r--kopete/protocols/jabber/libiris/jingle_iris.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 489afab4..41acad0e 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp
v_songTitle = _songtitle;
}
-+void tqStatus::setCapsNode(const QString & _capsNode)
++void Status::setCapsNode(const QString & _capsNode)
+{
+ v_capsNode = _capsNode;
+}
+
-+void tqStatus::setCapsVersion(const QString & _capsVersion)
++void Status::setCapsVersion(const QString & _capsVersion)
+{
+ v_capsVersion = _capsVersion;
+}
+
-+void tqStatus::setCapsExt(const QString & _capsExt)
++void Status::setCapsExt(const QString & _capsExt)
+{
+ v_capsExt = _capsExt;
+}
+
- bool tqStatus::isAvailable() const
+ bool Status::isAvailable() const
{
return v_isAvailable;
@@ -836,6 +851,21 @@
return v_songTitle;
}
-+const QString & tqStatus::capsNode() const
++const QString & Status::capsNode() const
+{
+ return v_capsNode;
+}
+
-+const QString & tqStatus::capsVersion() const
++const QString & Status::capsVersion() const
+{
+ return v_capsVersion;
+}
+
-+const QString & tqStatus::capsExt() const
++const QString & Status::capsExt() const
+{
+ return v_capsExt;
+}
+
- int tqStatus::errorCode() const
+ int Status::errorCode() const
{
return ecode;
@@ -1427,6 +1457,15 @@