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/Session | |
| 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/Session')
| -rw-r--r-- | Swiften/Session/BasicSessionStream.cpp | 12 | ||||
| -rw-r--r-- | Swiften/Session/Session.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Session/Session.h | 12 | ||||
| -rw-r--r-- | Swiften/Session/SessionStream.h | 12 | ||||
| -rw-r--r-- | Swiften/Session/SessionTracer.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Session/SessionTracer.h | 4 |
6 files changed, 24 insertions, 23 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp index 43f1c48..c2d8515 100644 --- a/Swiften/Session/BasicSessionStream.cpp +++ b/Swiften/Session/BasicSessionStream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,14 +9,14 @@ #include <boost/bind.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <Swiften/StreamStack/XMPPLayer.h> -#include <Swiften/StreamStack/StreamStack.h> -#include <Swiften/StreamStack/ConnectionLayer.h> -#include <Swiften/StreamStack/WhitespacePingLayer.h> #include <Swiften/StreamStack/CompressionLayer.h> +#include <Swiften/StreamStack/ConnectionLayer.h> +#include <Swiften/StreamStack/StreamStack.h> #include <Swiften/StreamStack/TLSLayer.h> -#include <Swiften/TLS/TLSContextFactory.h> +#include <Swiften/StreamStack/WhitespacePingLayer.h> +#include <Swiften/StreamStack/XMPPLayer.h> #include <Swiften/TLS/TLSContext.h> +#include <Swiften/TLS/TLSContextFactory.h> namespace Swift { diff --git a/Swiften/Session/Session.cpp b/Swiften/Session/Session.cpp index 4dd8921..95d7227 100644 --- a/Swiften/Session/Session.cpp +++ b/Swiften/Session/Session.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,8 +8,8 @@ #include <boost/bind.hpp> -#include <Swiften/StreamStack/XMPPLayer.h> #include <Swiften/StreamStack/StreamStack.h> +#include <Swiften/StreamStack/XMPPLayer.h> namespace Swift { diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h index c911fe6..a6dae80 100644 --- a/Swiften/Session/Session.h +++ b/Swiften/Session/Session.h @@ -1,22 +1,22 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/shared_ptr.hpp> -#include <Swiften/Base/boost_bsignals.h> -#include <boost/optional.hpp> #include <boost/enable_shared_from_this.hpp> +#include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> -#include <Swiften/JID/JID.h> +#include <Swiften/Base/SafeByteArray.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ToplevelElement.h> +#include <Swiften/JID/JID.h> #include <Swiften/Network/Connection.h> #include <Swiften/StreamStack/ConnectionLayer.h> -#include <Swiften/Base/SafeByteArray.h> namespace Swift { class ProtocolHeader; diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index 8513c1a..9dcec71 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -1,23 +1,23 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Base/boost_bsignals.h> -#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Elements/ProtocolHeader.h> -#include <Swiften/Elements/ToplevelElement.h> #include <Swiften/Base/Error.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/TLS/CertificateWithKey.h> +#include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Elements/ProtocolHeader.h> +#include <Swiften/Elements/ToplevelElement.h> #include <Swiften/TLS/Certificate.h> #include <Swiften/TLS/CertificateVerificationError.h> +#include <Swiften/TLS/CertificateWithKey.h> namespace Swift { class SWIFTEN_API SessionStream { diff --git a/Swiften/Session/SessionTracer.cpp b/Swiften/Session/SessionTracer.cpp index 32ddc16..61e8cc7 100644 --- a/Swiften/Session/SessionTracer.cpp +++ b/Swiften/Session/SessionTracer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,6 +7,7 @@ #include <Swiften/Session/SessionTracer.h> #include <iostream> + #include <boost/bind.hpp> namespace Swift { diff --git a/Swiften/Session/SessionTracer.h b/Swiften/Session/SessionTracer.h index 4900fd6..adc72b0 100644 --- a/Swiften/Session/SessionTracer.h +++ b/Swiften/Session/SessionTracer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,8 +9,8 @@ #include <string> #include <Swiften/Base/API.h> -#include <Swiften/Session/Session.h> #include <Swiften/Base/SafeByteArray.h> +#include <Swiften/Session/Session.h> namespace Swift { class SWIFTEN_API SessionTracer { |