Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-29 17:27:10 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-30 11:24:00 (GMT) |
| commit | 5de19b60ae5593adbc3d913f9c64162e21bc702a (patch) | |
| tree | 07d3e7a9e6105609858931154ee7fbfc599bd34a /Swiften/Jingle | |
| parent | 74e51310d27e9d9a66d2d790360549c48abec8d1 (diff) | |
| download | swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.zip swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.tar.bz2 | |
Apply consistent #include grouping and sorting style
Changed "" style includes to <> style.
Test-Information:
Build with Clang 3.9.0 and ran all tests on OS X 10.11.4.
Change-Id: Ic05e53f2e5dba39cc1307b116fc5f17b62ab9eb8
Diffstat (limited to 'Swiften/Jingle')
| -rw-r--r-- | Swiften/Jingle/FakeJingleSession.cpp | 5 | ||||
| -rw-r--r-- | Swiften/Jingle/FakeJingleSession.h | 11 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleResponder.cpp | 7 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleResponder.h | 4 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSession.cpp | 5 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSession.h | 7 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionImpl.cpp | 17 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionImpl.h | 5 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionManager.cpp | 9 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionManager.h | 5 |
10 files changed, 40 insertions, 35 deletions
diff --git a/Swiften/Jingle/FakeJingleSession.cpp b/Swiften/Jingle/FakeJingleSession.cpp index 864dd53..fae3425 100644 --- a/Swiften/Jingle/FakeJingleSession.cpp +++ b/Swiften/Jingle/FakeJingleSession.cpp @@ -5,16 +5,17 @@ */ /* - * Copyright (c) 2014-2015 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Jingle/FakeJingleSession.h> -#include <Swiften/Jingle/JingleSessionListener.h> #include <boost/smart_ptr/make_shared.hpp> +#include <Swiften/Jingle/JingleSessionListener.h> + namespace Swift { FakeJingleSession::FakeJingleSession(const JID& initiator, const std::string& id) : JingleSession(initiator, id) { diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h index f250b1a..dc7e56a 100644 --- a/Swiften/Jingle/FakeJingleSession.h +++ b/Swiften/Jingle/FakeJingleSession.h @@ -5,26 +5,27 @@ */ /* - * Copyright (c) 2013-2015 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/shared_ptr.hpp> #include <string> #include <vector> + +#include <boost/shared_ptr.hpp> #include <boost/variant.hpp> #include <Swiften/Base/API.h> +#include <Swiften/Base/Override.h> #include <Swiften/Base/SimpleIDGenerator.h> #include <Swiften/Base/boost_bsignals.h> -#include <Swiften/Base/Override.h> -#include <Swiften/JID/JID.h> #include <Swiften/Elements/JinglePayload.h> -#include <Swiften/Jingle/JingleSession.h> +#include <Swiften/JID/JID.h> #include <Swiften/Jingle/JingleContentID.h> +#include <Swiften/Jingle/JingleSession.h> namespace Swift { class JingleContentID; diff --git a/Swiften/Jingle/JingleResponder.cpp b/Swiften/Jingle/JingleResponder.cpp index b0caa74..16ed1da 100644 --- a/Swiften/Jingle/JingleResponder.cpp +++ b/Swiften/Jingle/JingleResponder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,10 +8,9 @@ #include <boost/smart_ptr/make_shared.hpp> -#include <Swiften/Jingle/JingleSessionManager.h> -#include <Swiften/Jingle/JingleSessionImpl.h> - #include <Swiften/Base/Log.h> +#include <Swiften/Jingle/JingleSessionImpl.h> +#include <Swiften/Jingle/JingleSessionManager.h> namespace Swift { diff --git a/Swiften/Jingle/JingleResponder.h b/Swiften/Jingle/JingleResponder.h index cf01e6f..1468a54 100644 --- a/Swiften/Jingle/JingleResponder.h +++ b/Swiften/Jingle/JingleResponder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,8 +7,8 @@ #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Queries/SetResponder.h> #include <Swiften/Elements/JinglePayload.h> +#include <Swiften/Queries/SetResponder.h> namespace Swift { class IQRouter; diff --git a/Swiften/Jingle/JingleSession.cpp b/Swiften/Jingle/JingleSession.cpp index bb3ce10..65a68f9 100644 --- a/Swiften/Jingle/JingleSession.cpp +++ b/Swiften/Jingle/JingleSession.cpp @@ -1,14 +1,15 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Jingle/JingleSession.h> -#include <boost/smart_ptr/make_shared.hpp> #include <algorithm> + #include <boost/function.hpp> +#include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/foreach.h> diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h index 7d7d45e..6c76f3c 100644 --- a/Swiften/Jingle/JingleSession.h +++ b/Swiften/Jingle/JingleSession.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,14 +8,15 @@ #include <string> #include <vector> -#include <boost/shared_ptr.hpp> + #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Listenable.h> #include <Swiften/Base/boost_bsignals.h> -#include <Swiften/JID/JID.h> #include <Swiften/Elements/JinglePayload.h> +#include <Swiften/JID/JID.h> namespace Swift { class JingleSessionListener; diff --git a/Swiften/Jingle/JingleSessionImpl.cpp b/Swiften/Jingle/JingleSessionImpl.cpp index a5273d6..a19947a 100644 --- a/Swiften/Jingle/JingleSessionImpl.cpp +++ b/Swiften/Jingle/JingleSessionImpl.cpp @@ -1,24 +1,23 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Jingle/JingleSessionImpl.h> -#include <boost/smart_ptr/make_shared.hpp> -#include <boost/bind.hpp> #include <algorithm> -#include <Swiften/Parser/PayloadParsers/JingleParser.h> +#include <boost/bind.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <Swiften/Base/Log.h> +#include <Swiften/Elements/JingleContentPayload.h> #include <Swiften/Jingle/JingleContentID.h> #include <Swiften/Jingle/JingleSessionListener.h> -#include <Swiften/Elements/JingleContentPayload.h> -#include <Swiften/Queries/Request.h> +#include <Swiften/Parser/PayloadParsers/JingleParser.h> #include <Swiften/Queries/GenericRequest.h> - -#include <Swiften/Base/Log.h> - +#include <Swiften/Queries/Request.h> #include <Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h> namespace Swift { diff --git a/Swiften/Jingle/JingleSessionImpl.h b/Swiften/Jingle/JingleSessionImpl.h index 4c455a5..4d21cd3 100644 --- a/Swiften/Jingle/JingleSessionImpl.h +++ b/Swiften/Jingle/JingleSessionImpl.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2011-2013 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/shared_ptr.hpp> #include <map> +#include <boost/shared_ptr.hpp> + #include <Swiften/Jingle/JingleSession.h> #include <Swiften/Queries/GenericRequest.h> diff --git a/Swiften/Jingle/JingleSessionManager.cpp b/Swiften/Jingle/JingleSessionManager.cpp index 2a94413..81014e7 100644 --- a/Swiften/Jingle/JingleSessionManager.cpp +++ b/Swiften/Jingle/JingleSessionManager.cpp @@ -1,15 +1,16 @@ /* - * Copyright (c) 2011-2013 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Jingle/JingleSessionManager.h> -#include <Swiften/Jingle/JingleResponder.h> -#include <Swiften/Jingle/IncomingJingleSessionHandler.h> + +#include <Swiften/Base/Algorithm.h> #include <Swiften/Base/Log.h> #include <Swiften/Base/foreach.h> -#include <Swiften/Base/Algorithm.h> +#include <Swiften/Jingle/IncomingJingleSessionHandler.h> +#include <Swiften/Jingle/JingleResponder.h> namespace Swift { diff --git a/Swiften/Jingle/JingleSessionManager.h b/Swiften/Jingle/JingleSessionManager.h index ad47f84..fbfdb50 100644 --- a/Swiften/Jingle/JingleSessionManager.h +++ b/Swiften/Jingle/JingleSessionManager.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2011 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/shared_ptr.hpp> #include <map> +#include <boost/shared_ptr.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Jingle/JingleSessionImpl.h> |