diff options
author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 17:26:08 +0000 |
---|---|---|
committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 17:26:08 +0000 |
commit | cf81adffe15fa8ea0f333432e41f6d504148f18a (patch) | |
tree | f63bf7f6acaff8cc08682e9ba1613f7df2cd4e62 /examples | |
parent | 29232ae880effa5c7e5645e477b316df674d60ef (diff) | |
download | talk-cf81adffe15fa8ea0f333432e41f6d504148f18a.tar.gz |
(Auto)update libjingle 73222930-> 73226398
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
26 files changed, 46 insertions, 46 deletions
diff --git a/examples/call/call_main.cc b/examples/call/call_main.cc index b6168b3..cb309dc 100644 --- a/examples/call/call_main.cc +++ b/examples/call/call_main.cc @@ -38,10 +38,6 @@ #ifdef OSX #include "webrtc/base/maccocoasocketserver.h" #endif -#include "webrtc/base/pathutils.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stream.h" -#include "webrtc/base/win32socketserver.h" #include "talk/examples/call/callclient.h" #include "talk/examples/call/console.h" #include "talk/examples/call/mediaenginefactory.h" @@ -52,6 +48,10 @@ #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmpppump.h" #include "talk/xmpp/xmppsocket.h" +#include "webrtc/base/pathutils.h" +#include "webrtc/base/ssladapter.h" +#include "webrtc/base/stream.h" +#include "webrtc/base/win32socketserver.h" class DebugLog : public sigslot::has_slots<> { public: diff --git a/examples/call/call_unittest.cc b/examples/call/call_unittest.cc index 524726d..cc2878f 100644 --- a/examples/call/call_unittest.cc +++ b/examples/call/call_unittest.cc @@ -27,8 +27,8 @@ // Main function for all unit tests in talk/examples/call -#include "webrtc/base/logging.h" #include "testing/base/public/gunit.h" +#include "webrtc/base/logging.h" int main(int argc, char **argv) { rtc::LogMessage::LogToDebug(rtc::LogMessage::NO_LOGGING); diff --git a/examples/call/callclient.cc b/examples/call/callclient.cc index 7d1cd80..188f6c4 100644 --- a/examples/call/callclient.cc +++ b/examples/call/callclient.cc @@ -29,14 +29,6 @@ #include <string> -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/network.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/windowpickerfactory.h" #include "talk/examples/call/console.h" #include "talk/examples/call/friendinvitesendtask.h" #include "talk/examples/call/muc.h" @@ -47,6 +39,14 @@ #include "talk/media/base/mediaengine.h" #include "talk/media/base/rtpdataengine.h" #include "talk/media/base/screencastid.h" +#include "webrtc/base/helpers.h" +#include "webrtc/base/logging.h" +#include "webrtc/base/network.h" +#include "webrtc/base/socketaddress.h" +#include "webrtc/base/stringencode.h" +#include "webrtc/base/stringutils.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/windowpickerfactory.h" #ifdef HAVE_SCTP #include "talk/media/sctp/sctpdataengine.h" #endif @@ -62,8 +62,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" #include "talk/xmpp/mucroomconfigtask.h" #include "talk/xmpp/mucroomlookuptask.h" -#include "talk/xmpp/presenceouttask.h" #include "talk/xmpp/pingtask.h" +#include "talk/xmpp/presenceouttask.h" namespace { diff --git a/examples/call/callclient.h b/examples/call/callclient.h index f25b9f5..50c584b 100644 --- a/examples/call/callclient.h +++ b/examples/call/callclient.h @@ -32,8 +32,6 @@ #include <string> #include <vector> -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/base/sslidentity.h" #include "talk/examples/call/console.h" #include "talk/media/base/mediachannel.h" #include "talk/p2p/base/session.h" @@ -42,6 +40,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" #include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppclient.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sslidentity.h" namespace buzz { class PresencePushTask; diff --git a/examples/call/callclient_unittest.cc b/examples/call/callclient_unittest.cc index 6268917..d11580e 100644 --- a/examples/call/callclient_unittest.cc +++ b/examples/call/callclient_unittest.cc @@ -27,11 +27,11 @@ // Unit tests for CallClient -#include "webrtc/base/gunit.h" #include "talk/examples/call/callclient.h" #include "talk/media/base/filemediaengine.h" #include "talk/media/base/mediaengine.h" #include "talk/xmpp/xmppthread.h" +#include "webrtc/base/gunit.h" TEST(CallClientTest, CreateCallClientWithDefaultMediaEngine) { buzz::XmppPump pump; diff --git a/examples/call/console.cc b/examples/call/console.cc index e3ed4f8..a0da2af 100644 --- a/examples/call/console.cc +++ b/examples/call/console.cc @@ -35,11 +35,11 @@ #include <unistd.h> #endif // POSIX +#include "talk/examples/call/callclient.h" +#include "talk/examples/call/console.h" #include "webrtc/base/logging.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/stringutils.h" -#include "talk/examples/call/console.h" -#include "talk/examples/call/callclient.h" #ifdef POSIX static void DoNothing(int unused) {} diff --git a/examples/call/console.h b/examples/call/console.h index 00b35a0..abcae99 100644 --- a/examples/call/console.h +++ b/examples/call/console.h @@ -30,9 +30,9 @@ #include <stdio.h> -#include "webrtc/base/thread.h" #include "webrtc/base/messagequeue.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread.h" class CallClient; diff --git a/examples/call/friendinvitesendtask.cc b/examples/call/friendinvitesendtask.cc index cdb0b2c..dae1006 100644 --- a/examples/call/friendinvitesendtask.cc +++ b/examples/call/friendinvitesendtask.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/constants.h" #include "talk/examples/call/friendinvitesendtask.h" +#include "talk/xmpp/constants.h" namespace buzz { diff --git a/examples/call/mediaenginefactory.cc b/examples/call/mediaenginefactory.cc index 472a880..dd62bf8 100644 --- a/examples/call/mediaenginefactory.cc +++ b/examples/call/mediaenginefactory.cc @@ -27,10 +27,10 @@ #include "talk/examples/call/mediaenginefactory.h" -#include "webrtc/base/stringutils.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/filemediaengine.h" #include "talk/media/base/mediaengine.h" +#include "webrtc/base/stringutils.h" std::vector<cricket::AudioCodec> RequiredAudioCodecs() { std::vector<cricket::AudioCodec> audio_codecs; diff --git a/examples/call/mucinviterecvtask.cc b/examples/call/mucinviterecvtask.cc index 061db74..e32456f 100644 --- a/examples/call/mucinviterecvtask.cc +++ b/examples/call/mucinviterecvtask.cc @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmpp/constants.h" #include "talk/examples/call/mucinviterecvtask.h" +#include "talk/xmpp/constants.h" namespace buzz { diff --git a/examples/call/mucinviterecvtask.h b/examples/call/mucinviterecvtask.h index 4ec06d0..ddfd6be 100644 --- a/examples/call/mucinviterecvtask.h +++ b/examples/call/mucinviterecvtask.h @@ -30,9 +30,9 @@ #include <vector> -#include "webrtc/base/sigslot.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" +#include "webrtc/base/sigslot.h" namespace buzz { diff --git a/examples/call/mucinvitesendtask.h b/examples/call/mucinvitesendtask.h index 2429b31..3ae74c1 100644 --- a/examples/call/mucinvitesendtask.h +++ b/examples/call/mucinvitesendtask.h @@ -28,9 +28,9 @@ #ifndef _MUCINVITESENDTASK_H_ #define _MUCINVITESENDTASK_H_ +#include "talk/examples/call/muc.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/examples/call/muc.h" namespace buzz { diff --git a/examples/call/presencepushtask.cc b/examples/call/presencepushtask.cc index 31ccc32..b598eb6 100644 --- a/examples/call/presencepushtask.cc +++ b/examples/call/presencepushtask.cc @@ -27,9 +27,9 @@ #include "talk/examples/call/presencepushtask.h" -#include "webrtc/base/stringencode.h" #include "talk/examples/call/muc.h" #include "talk/xmpp/constants.h" +#include "webrtc/base/stringencode.h" diff --git a/examples/call/presencepushtask.h b/examples/call/presencepushtask.h index 5a080d3..c13a4f5 100644 --- a/examples/call/presencepushtask.h +++ b/examples/call/presencepushtask.h @@ -30,11 +30,11 @@ #include <vector> +#include "talk/examples/call/callclient.h" +#include "talk/xmpp/presencestatus.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmpptask.h" -#include "talk/xmpp/presencestatus.h" #include "webrtc/base/sigslot.h" -#include "talk/examples/call/callclient.h" namespace buzz { diff --git a/examples/login/login_main.cc b/examples/login/login_main.cc index 55243aa..bfe12af 100644 --- a/examples/login/login_main.cc +++ b/examples/login/login_main.cc @@ -29,11 +29,11 @@ #include <iostream> -#include "webrtc/base/thread.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/xmppclientsettings.h" #include "talk/xmpp/xmppengine.h" #include "talk/xmpp/xmppthread.h" +#include "webrtc/base/thread.h" int main(int argc, char **argv) { std::cout << "OAuth Access Token: "; diff --git a/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch b/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch index 3ac2c3b..cf7719c 100644 --- a/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch +++ b/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch @@ -36,5 +36,5 @@ #warning "This project uses features only available in iOS SDK 6.0 and later." #endif -#import <UIKit/UIKit.h> #import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc index 64026c5..f49aee6 100644 --- a/examples/peerconnection/client/conductor.cc +++ b/examples/peerconnection/client/conductor.cc @@ -30,11 +30,11 @@ #include <utility> #include "talk/app/webrtc/videosourceinterface.h" +#include "talk/examples/peerconnection/client/defaults.h" +#include "talk/media/devices/devicemanager.h" #include "webrtc/base/common.h" #include "webrtc/base/json.h" #include "webrtc/base/logging.h" -#include "talk/examples/peerconnection/client/defaults.h" -#include "talk/media/devices/devicemanager.h" // Names used for a IceCandidate JSON object. const char kCandidateSdpMidName[] = "sdpMid"; diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h index 93b0779..0aff531 100644 --- a/examples/peerconnection/client/conductor.h +++ b/examples/peerconnection/client/conductor.h @@ -34,10 +34,10 @@ #include <set> #include <string> -#include "talk/examples/peerconnection/client/main_wnd.h" -#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/app/webrtc/mediastreaminterface.h" #include "talk/app/webrtc/peerconnectioninterface.h" +#include "talk/examples/peerconnection/client/main_wnd.h" +#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "webrtc/base/scoped_ptr.h" namespace webrtc { diff --git a/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc index 2296c42..05c73ec 100644 --- a/examples/peerconnection/client/main_wnd.cc +++ b/examples/peerconnection/client/main_wnd.cc @@ -29,9 +29,9 @@ #include <math.h> +#include "talk/examples/peerconnection/client/defaults.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "talk/examples/peerconnection/client/defaults.h" ATOM MainWnd::wnd_class_ = 0; const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; diff --git a/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h index e87153a..08bdabb 100644 --- a/examples/peerconnection/client/main_wnd.h +++ b/examples/peerconnection/client/main_wnd.h @@ -33,12 +33,12 @@ #include <string> #include "talk/app/webrtc/mediastreaminterface.h" -#include "webrtc/base/win32.h" #include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/media/base/mediachannel.h" #include "talk/media/base/videocommon.h" #include "talk/media/base/videoframe.h" #include "talk/media/base/videorenderer.h" +#include "webrtc/base/win32.h" class MainWndCallback { public: diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc index e5bef05..3aaea41 100644 --- a/examples/peerconnection/client/peer_connection_client.cc +++ b/examples/peerconnection/client/peer_connection_client.cc @@ -29,8 +29,8 @@ #include "talk/examples/peerconnection/client/defaults.h" #include "webrtc/base/common.h" -#include "webrtc/base/nethelpers.h" #include "webrtc/base/logging.h" +#include "webrtc/base/nethelpers.h" #include "webrtc/base/stringutils.h" #ifdef WIN32 diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h index 3187895..7b897a5 100644 --- a/examples/peerconnection/client/peer_connection_client.h +++ b/examples/peerconnection/client/peer_connection_client.h @@ -33,10 +33,10 @@ #include <string> #include "webrtc/base/nethelpers.h" -#include "webrtc/base/signalthread.h" -#include "webrtc/base/sigslot.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/signalthread.h" +#include "webrtc/base/sigslot.h" typedef std::map<int, std::string> Peers; diff --git a/examples/peerconnection/server/main.cc b/examples/peerconnection/server/main.cc index 9be3bbe..1bdbfdc 100644 --- a/examples/peerconnection/server/main.cc +++ b/examples/peerconnection/server/main.cc @@ -31,10 +31,10 @@ #include <vector> -#include "webrtc/base/flags.h" #include "talk/examples/peerconnection/server/data_socket.h" #include "talk/examples/peerconnection/server/peer_channel.h" #include "talk/examples/peerconnection/server/utils.h" +#include "webrtc/base/flags.h" DEFINE_bool(help, false, "Prints this message"); DEFINE_int(port, 8888, "The port on which to listen."); diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc index d9dde66..1a4ab78 100644 --- a/examples/relayserver/relayserver_main.cc +++ b/examples/relayserver/relayserver_main.cc @@ -27,9 +27,9 @@ #include <iostream> // NOLINT -#include "webrtc/base/thread.h" -#include "webrtc/base/scoped_ptr.h" #include "talk/p2p/base/relayserver.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread.h" int main(int argc, char **argv) { if (argc != 3) { diff --git a/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc index 3ac2ea6..f800f31 100644 --- a/examples/stunserver/stunserver_main.cc +++ b/examples/stunserver/stunserver_main.cc @@ -31,8 +31,8 @@ #include <iostream> -#include "webrtc/base/thread.h" #include "talk/p2p/base/stunserver.h" +#include "webrtc/base/thread.h" using namespace cricket; diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc index a32f42c..607b8cf 100644 --- a/examples/turnserver/turnserver_main.cc +++ b/examples/turnserver/turnserver_main.cc @@ -27,12 +27,12 @@ #include <iostream> // NOLINT +#include "talk/p2p/base/basicpacketsocketfactory.h" +#include "talk/p2p/base/turnserver.h" #include "webrtc/base/asyncudpsocket.h" #include "webrtc/base/optionsfile.h" -#include "webrtc/base/thread.h" #include "webrtc/base/stringencode.h" -#include "talk/p2p/base/basicpacketsocketfactory.h" -#include "talk/p2p/base/turnserver.h" +#include "webrtc/base/thread.h" static const char kSoftware[] = "libjingle TurnServer"; |