From 00fe193f5a98776c136dee2f74fe392d1f595a51 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 11 Jan 2012 18:22:56 -0600 Subject: Fix jingle FTBFS This closes Bug 700 --- .../protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc | 2 +- .../jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h | 2 +- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kopete/protocols/jabber/jingle') 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 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 #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 #include #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 #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 -#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" -- cgit v1.2.1