summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-11 18:22:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-11 18:22:56 -0600
commit00fe193f5a98776c136dee2f74fe392d1f595a51 (patch)
tree403ee3d152aba38842e18b578581a8ab841890f5 /kopete/protocols/jabber/jingle/libjingle
parent36f30c5f00b50f5455b4c98bf2a7132a665cd971 (diff)
downloadtdenetwork-00fe193f5a98776c136dee2f74fe392d1f595a51.tar.gz
tdenetwork-00fe193f5a98776c136dee2f74fe392d1f595a51.zip
Fix jingle FTBFS
This closes Bug 700
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
index 668309f8..b64c444a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
@@ -31,7 +31,7 @@
#include "talk/p2p/client/sessionclient.h"
#include "talk/p2p/base/helpers.h"
#include "talk/base/logging.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/constants.h"
#include "talk/xmllite/xmlprinter.h"
#include <iostream>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
index 46dc7b42..f9eb071c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
@@ -30,7 +30,7 @@
#include "talk/base/logging.h"
#include "talk/session/receiver.h"
#include "talk/session/phone/phonesessionclient.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace {
const std::string NS_PHONE("http://www.google.com/session/phone");
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
index ccb08884..e20b57e3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
@@ -28,7 +28,7 @@
#include <string>
#include "talk/base/common.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlconstants.h"
//#define new TRACK_NEW
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
index 08ccd288..de0ccddb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
@@ -32,7 +32,7 @@
#include "talk/base/common.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlparser.h"
#include "talk/xmllite/xmlbuilder.h"
#include "talk/xmllite/xmlprinter.h"
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
index 2c9fc860..69b6f11c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
@@ -31,7 +31,7 @@
#include <iosfwd>
#include <string>
#include "talk/base/scoped_ptr.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace buzz {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
index 6fd7665c..4a759008 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
@@ -31,7 +31,7 @@
#include <string>
#include "talk/base/scoped_ptr.h"
#include "talk/base/stl_decl.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
namespace buzz {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
index 18987e7d..1eee5013 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
@@ -29,7 +29,7 @@
#include "talk/base/basicdefs.h"
#include "talk/xmllite/xmlconstants.h"
#include "talk/xmllite/xmlelement.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/jid.h"
#include "talk/xmpp/constants.h"
namespace buzz {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
index 00ff8e8d..52646e9f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
@@ -29,7 +29,7 @@
#define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_
#include <string>
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmpp/jid.h"
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
index 1497c3ec..e20a8fee 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
@@ -30,7 +30,7 @@
// also part of the API
#include "talk/xmpp/jid.h"
-#include "talk/xmllite/tqname.h"
+#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlelement.h"