diff options
Diffstat (limited to 'xmpp')
37 files changed, 76 insertions, 76 deletions
diff --git a/xmpp/asyncsocket.h b/xmpp/asyncsocket.h index 5e83b63..2514742 100644 --- a/xmpp/asyncsocket.h +++ b/xmpp/asyncsocket.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ASYNCSOCKET_H_ -#define _ASYNCSOCKET_H_ +#ifndef TALK_XMPP_ASYNCSOCKET_H_ +#define TALK_XMPP_ASYNCSOCKET_H_ #include <string> @@ -86,4 +86,4 @@ public: } -#endif +#endif // TALK_XMPP_ASYNCSOCKET_H_ diff --git a/xmpp/chatroommodule.h b/xmpp/chatroommodule.h index 47a7106..8358fc1 100644 --- a/xmpp/chatroommodule.h +++ b/xmpp/chatroommodule.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _multiuserchatmodule_h_ -#define _multiuserchatmodule_h_ +#ifndef TALK_XMPP_CHATROOMMODULE_H_ +#define TALK_XMPP_CHATROOMMODULE_H_ #include "talk/xmpp/module.h" #include "talk/xmpp/rostermodule.h" @@ -267,4 +267,4 @@ public: } -#endif +#endif // TALK_XMPP_CHATROOMMODULE_H_ diff --git a/xmpp/constants.cc b/xmpp/constants.cc index a2179ca..297eafd 100644 --- a/xmpp/constants.cc +++ b/xmpp/constants.cc @@ -29,9 +29,9 @@ #include <string> -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlconstants.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" #include "webrtc/base/basicdefs.h" diff --git a/xmpp/constants.h b/xmpp/constants.h index 6d94095..6aa1a54 100644 --- a/xmpp/constants.h +++ b/xmpp/constants.h @@ -29,7 +29,7 @@ #define TALK_XMPP_CONSTANTS_H_ #include <string> -#include "talk/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/qname.h" #include "talk/xmpp/jid.h" namespace buzz { diff --git a/xmpp/hangoutpubsubclient.cc b/xmpp/hangoutpubsubclient.cc index 834f844..63f5bcf 100644 --- a/xmpp/hangoutpubsubclient.cc +++ b/xmpp/hangoutpubsubclient.cc @@ -27,8 +27,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "webrtc/base/logging.h" diff --git a/xmpp/hangoutpubsubclient_unittest.cc b/xmpp/hangoutpubsubclient_unittest.cc index c12b791..555ee5c 100644 --- a/xmpp/hangoutpubsubclient_unittest.cc +++ b/xmpp/hangoutpubsubclient_unittest.cc @@ -3,8 +3,8 @@ #include <string> -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/hangoutpubsubclient.h" @@ -29,7 +29,7 @@ #define TALK_XMPP_JID_H_ #include <string> -#include "talk/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" #include "webrtc/base/basictypes.h" namespace buzz { diff --git a/xmpp/jingleinfotask.h b/xmpp/jingleinfotask.h index 5865a77..18cb5a9 100644 --- a/xmpp/jingleinfotask.h +++ b/xmpp/jingleinfotask.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_ -#define TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_ +#ifndef TALK_XMPP_JINGLEINFOTASK_H_ +#define TALK_XMPP_JINGLEINFOTASK_H_ #include <vector> @@ -58,4 +58,4 @@ class JingleInfoTask : public XmppTask { }; } -#endif // TALK_EXAMPLES_LOGIN_JINGLEINFOTASK_H_ +#endif // TALK_XMPP_JINGLEINFOTASK_H_ diff --git a/xmpp/module.h b/xmpp/module.h index 37396ef..a5d0687 100644 --- a/xmpp/module.h +++ b/xmpp/module.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _module_h_ -#define _module_h_ +#ifndef TALK_XMPP_MODULE_H_ +#define TALK_XMPP_MODULE_H_ #include "talk/xmpp/xmppengine.h" @@ -49,4 +49,4 @@ public: }; } -#endif +#endif // TALK_XMPP_MODULE_H_ diff --git a/xmpp/moduleimpl.h b/xmpp/moduleimpl.h index 32a182b..897bfce 100644 --- a/xmpp/moduleimpl.h +++ b/xmpp/moduleimpl.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _moduleimpl_h_ -#define _moduleimpl_h_ +#ifndef TALK_XMPP_MODULEIMPL_H_ +#define TALK_XMPP_MODULEIMPL_H_ #include "talk/xmpp/module.h" #include "talk/xmpp/xmppengine.h" @@ -90,4 +90,4 @@ private: } -#endif +#endif // TALK_XMPP_MODULEIMPL_H_ diff --git a/xmpp/mucroomconfigtask_unittest.cc b/xmpp/mucroomconfigtask_unittest.cc index 00a9c6e..bf5e7b4 100644 --- a/xmpp/mucroomconfigtask_unittest.cc +++ b/xmpp/mucroomconfigtask_unittest.cc @@ -28,7 +28,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomconfigtask.h" diff --git a/xmpp/mucroomdiscoverytask_unittest.cc b/xmpp/mucroomdiscoverytask_unittest.cc index ef7e477..e1a633e 100644 --- a/xmpp/mucroomdiscoverytask_unittest.cc +++ b/xmpp/mucroomdiscoverytask_unittest.cc @@ -28,7 +28,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomdiscoverytask.h" diff --git a/xmpp/mucroomlookuptask_unittest.cc b/xmpp/mucroomlookuptask_unittest.cc index 341fd3f..03be292 100644 --- a/xmpp/mucroomlookuptask_unittest.cc +++ b/xmpp/mucroomlookuptask_unittest.cc @@ -28,7 +28,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomlookuptask.h" diff --git a/xmpp/mucroomuniquehangoutidtask_unittest.cc b/xmpp/mucroomuniquehangoutidtask_unittest.cc index 5cabcbe..42bed13 100644 --- a/xmpp/mucroomuniquehangoutidtask_unittest.cc +++ b/xmpp/mucroomuniquehangoutidtask_unittest.cc @@ -28,7 +28,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomuniquehangoutidtask.h" diff --git a/xmpp/pingtask_unittest.cc b/xmpp/pingtask_unittest.cc index ce595a8..fe88a5c 100644 --- a/xmpp/pingtask_unittest.cc +++ b/xmpp/pingtask_unittest.cc @@ -28,7 +28,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/pingtask.h" diff --git a/xmpp/plainsaslhandler.h b/xmpp/plainsaslhandler.h index 2ca364c..31032e4 100644 --- a/xmpp/plainsaslhandler.h +++ b/xmpp/plainsaslhandler.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PLAINSASLHANDLER_H_ -#define _PLAINSASLHANDLER_H_ +#ifndef TALK_XMPP_PLAINSASLHANDLER_H_ +#define TALK_XMPP_PLAINSASLHANDLER_H_ #include <algorithm> #include "talk/xmpp/saslhandler.h" @@ -78,4 +78,4 @@ private: } -#endif +#endif // TALK_XMPP_PLAINSASLHANDLER_H_ diff --git a/xmpp/presenceouttask.h b/xmpp/presenceouttask.h index a72457e..53bbae5 100644 --- a/xmpp/presenceouttask.h +++ b/xmpp/presenceouttask.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PRESENCEOUTTASK_H_ -#define _PRESENCEOUTTASK_H_ +#ifndef TALK_XMPP_PRESENCEOUTTASK_H_ +#define TALK_XMPP_PRESENCEOUTTASK_H_ #include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppengine.h" @@ -51,4 +51,4 @@ private: } -#endif +#endif // TALK_XMPP_PRESENCEOUTTASK_H_ diff --git a/xmpp/pubsub_task.h b/xmpp/pubsub_task.h index 45a7462..2787cbc 100644 --- a/xmpp/pubsub_task.h +++ b/xmpp/pubsub_task.h @@ -30,7 +30,7 @@ #include <map> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmpptask.h" diff --git a/xmpp/pubsubclient_unittest.cc b/xmpp/pubsubclient_unittest.cc index 135dc37..f191a18 100644 --- a/xmpp/pubsubclient_unittest.cc +++ b/xmpp/pubsubclient_unittest.cc @@ -3,8 +3,8 @@ #include <string> -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/jid.h" diff --git a/xmpp/pubsubstateclient.h b/xmpp/pubsubstateclient.h index 2acbdaa..09ef0f4 100644 --- a/xmpp/pubsubstateclient.h +++ b/xmpp/pubsubstateclient.h @@ -32,8 +32,8 @@ #include <string> #include <vector> -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubclient.h" diff --git a/xmpp/pubsubtasks_unittest.cc b/xmpp/pubsubtasks_unittest.cc index 98cb7c1..48cd04a 100644 --- a/xmpp/pubsubtasks_unittest.cc +++ b/xmpp/pubsubtasks_unittest.cc @@ -3,8 +3,8 @@ #include <string> -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/iqtask.h" diff --git a/xmpp/rostermodule.h b/xmpp/rostermodule.h index 7e14dc1..dfb647d 100644 --- a/xmpp/rostermodule.h +++ b/xmpp/rostermodule.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _rostermodule_h_ -#define _rostermodule_h_ +#ifndef TALK_XMPP_ROSTERMODULE_H_ +#define TALK_XMPP_ROSTERMODULE_H_ #include "talk/xmpp/module.h" @@ -345,4 +345,4 @@ public: } -#endif +#endif // TALK_XMPP_ROSTERMODULE_H_ diff --git a/xmpp/rostermodule_unittest.cc b/xmpp/rostermodule_unittest.cc index 0e2b268..cb7f773 100644 --- a/xmpp/rostermodule_unittest.cc +++ b/xmpp/rostermodule_unittest.cc @@ -29,7 +29,7 @@ #include <sstream> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/rostermodule.h" #include "talk/xmpp/util_unittest.h" diff --git a/xmpp/rostermoduleimpl.h b/xmpp/rostermoduleimpl.h index a6b15cf..37d1117 100644 --- a/xmpp/rostermoduleimpl.h +++ b/xmpp/rostermoduleimpl.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _rostermoduleimpl_h_ -#define _rostermoduleimpl_h_ +#ifndef TALK_XMPP_XMPPTHREAD_H_ +#define TALK_XMPP_XMPPTHREAD_H_ #include "talk/xmpp/moduleimpl.h" #include "talk/xmpp/rostermodule.h" @@ -299,4 +299,4 @@ private: } -#endif +#endif // TALK_XMPP_XMPPTHREAD_H_ diff --git a/xmpp/saslcookiemechanism.h b/xmpp/saslcookiemechanism.h index 7a19d3e..eda142c 100644 --- a/xmpp/saslcookiemechanism.h +++ b/xmpp/saslcookiemechanism.h @@ -28,8 +28,8 @@ #ifndef TALK_XMPP_SASLCOOKIEMECHANISM_H_ #define TALK_XMPP_SASLCOOKIEMECHANISM_H_ -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslmechanism.h" diff --git a/xmpp/saslhandler.h b/xmpp/saslhandler.h index bead8aa..a4a73e4 100644 --- a/xmpp/saslhandler.h +++ b/xmpp/saslhandler.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SASLHANDLER_H_ -#define _SASLHANDLER_H_ +#ifndef TALK_XMPP_SASLHANDLER_H_ +#define TALK_XMPP_SASLHANDLER_H_ #include <string> #include <vector> @@ -56,4 +56,4 @@ public: } -#endif +#endif // TALK_XMPP_SASLHANDLER_H_ diff --git a/xmpp/saslmechanism.cc b/xmpp/saslmechanism.cc index 488007c..8877084 100644 --- a/xmpp/saslmechanism.cc +++ b/xmpp/saslmechanism.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslmechanism.h" #include "webrtc/base/base64.h" diff --git a/xmpp/saslmechanism.h b/xmpp/saslmechanism.h index f2e5adc..ee419d1 100644 --- a/xmpp/saslmechanism.h +++ b/xmpp/saslmechanism.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SASLMECHANISM_H_ -#define _SASLMECHANISM_H_ +#ifndef TALK_XMPP_SASLMECHANISM_H_ +#define TALK_XMPP_SASLMECHANISM_H_ #include <string> @@ -71,4 +71,4 @@ protected: } -#endif +#endif // TALK_XMPP_SASLMECHANISM_H_ diff --git a/xmpp/util_unittest.cc b/xmpp/util_unittest.cc index 66fb5ef..3e47d3f 100644 --- a/xmpp/util_unittest.cc +++ b/xmpp/util_unittest.cc @@ -4,7 +4,7 @@ #include <iostream> #include <sstream> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/util_unittest.h" #include "talk/xmpp/xmppengine.h" #include "webrtc/base/gunit.h" diff --git a/xmpp/xmppengine.h b/xmpp/xmppengine.h index 68f10fe..461e90f 100644 --- a/xmpp/xmppengine.h +++ b/xmpp/xmppengine.h @@ -25,12 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _xmppengine_h_ -#define _xmppengine_h_ +#ifndef TALK_XMPP_XMPPENGINE_H_ +#define TALK_XMPP_XMPPENGINE_H_ // also part of the API -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" @@ -346,4 +346,4 @@ public: } while (false) \ -#endif +#endif // TALK_XMPP_XMPPENGINE_H_ diff --git a/xmpp/xmppengine_unittest.cc b/xmpp/xmppengine_unittest.cc index 8d6c858..b519a65 100644 --- a/xmpp/xmppengine_unittest.cc +++ b/xmpp/xmppengine_unittest.cc @@ -4,7 +4,7 @@ #include <iostream> #include <sstream> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/plainsaslhandler.h" #include "talk/xmpp/saslplainmechanism.h" diff --git a/xmpp/xmppengineimpl.cc b/xmpp/xmppengineimpl.cc index bba96a4..5de9de7 100644 --- a/xmpp/xmppengineimpl.cc +++ b/xmpp/xmppengineimpl.cc @@ -31,8 +31,8 @@ #include <sstream> #include <vector> -#include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/xmlprinter.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlprinter.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslhandler.h" #include "talk/xmpp/xmpplogintask.h" diff --git a/xmpp/xmpplogintask.cc b/xmpp/xmpplogintask.cc index 2183c40..a48a94c 100644 --- a/xmpp/xmpplogintask.cc +++ b/xmpp/xmpplogintask.cc @@ -30,7 +30,7 @@ #include <string> #include <vector> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/saslmechanism.h" diff --git a/xmpp/xmpplogintask_unittest.cc b/xmpp/xmpplogintask_unittest.cc index 1cc16cc..ae9a554 100644 --- a/xmpp/xmpplogintask_unittest.cc +++ b/xmpp/xmpplogintask_unittest.cc @@ -4,7 +4,7 @@ #include <iostream> #include <sstream> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/plainsaslhandler.h" #include "talk/xmpp/saslplainmechanism.h" diff --git a/xmpp/xmppstanzaparser.cc b/xmpp/xmppstanzaparser.cc index 3e6ad47..4795839 100644 --- a/xmpp/xmppstanzaparser.cc +++ b/xmpp/xmppstanzaparser.cc @@ -27,7 +27,7 @@ #include "talk/xmpp/xmppstanzaparser.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/common.h" #ifdef EXPAT_RELATIVE_PATH diff --git a/xmpp/xmppstanzaparser.h b/xmpp/xmppstanzaparser.h index d9a8933..ffb3275 100644 --- a/xmpp/xmppstanzaparser.h +++ b/xmpp/xmppstanzaparser.h @@ -25,11 +25,11 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _xmppstanzaparser_h_ -#define _xmppstanzaparser_h_ +#ifndef TALK_XMPP_XMPPSTANZAPARSER_H_ +#define TALK_XMPP_XMPPSTANZAPARSER_H_ -#include "talk/xmllite/xmlbuilder.h" -#include "talk/xmllite/xmlparser.h" +#include "webrtc/libjingle/xmllite/xmlbuilder.h" +#include "webrtc/libjingle/xmllite/xmlparser.h" namespace buzz { @@ -94,4 +94,4 @@ private: } -#endif +#endif // TALK_XMPP_XMPPSTANZAPARSER_H_ diff --git a/xmpp/xmppstanzaparser_unittest.cc b/xmpp/xmppstanzaparser_unittest.cc index 4e60d81..0b114c0 100644 --- a/xmpp/xmppstanzaparser_unittest.cc +++ b/xmpp/xmppstanzaparser_unittest.cc @@ -4,7 +4,7 @@ #include <iostream> #include <sstream> #include <string> -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/xmppstanzaparser.h" #include "webrtc/base/common.h" #include "webrtc/base/gunit.h" |