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/Presence | |
| 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/Presence')
| -rw-r--r-- | Swiften/Presence/DirectedPresenceSender.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Presence/DirectedPresenceSender.h | 4 | ||||
| -rw-r--r-- | Swiften/Presence/PayloadAddingPresenceSender.h | 4 | ||||
| -rw-r--r-- | Swiften/Presence/StanzaChannelPresenceSender.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Presence/SubscriptionManager.h | 8 | ||||
| -rw-r--r-- | Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp | 12 |
6 files changed, 19 insertions, 15 deletions
diff --git a/Swiften/Presence/DirectedPresenceSender.cpp b/Swiften/Presence/DirectedPresenceSender.cpp index c19d8a5..3d24211 100644 --- a/Swiften/Presence/DirectedPresenceSender.cpp +++ b/Swiften/Presence/DirectedPresenceSender.cpp @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Presence/DirectedPresenceSender.h> + #include <Swiften/Base/foreach.h> namespace Swift { diff --git a/Swiften/Presence/DirectedPresenceSender.h b/Swiften/Presence/DirectedPresenceSender.h index 74c91bd..c8e8043 100644 --- a/Swiften/Presence/DirectedPresenceSender.h +++ b/Swiften/Presence/DirectedPresenceSender.h @@ -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. */ @@ -10,9 +10,9 @@ #include <boost/optional.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Elements/Presence.h> #include <Swiften/Presence/PresenceSender.h> -#include <Swiften/Base/API.h> namespace Swift { class SWIFTEN_API DirectedPresenceSender : public PresenceSender { diff --git a/Swiften/Presence/PayloadAddingPresenceSender.h b/Swiften/Presence/PayloadAddingPresenceSender.h index fc240ef..37f47c5 100644 --- a/Swiften/Presence/PayloadAddingPresenceSender.h +++ b/Swiften/Presence/PayloadAddingPresenceSender.h @@ -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,8 +7,8 @@ #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Presence/PresenceSender.h> #include <Swiften/Elements/Payload.h> +#include <Swiften/Presence/PresenceSender.h> namespace Swift { class StanzaChannel; diff --git a/Swiften/Presence/StanzaChannelPresenceSender.cpp b/Swiften/Presence/StanzaChannelPresenceSender.cpp index 5132280..33db699 100644 --- a/Swiften/Presence/StanzaChannelPresenceSender.cpp +++ b/Swiften/Presence/StanzaChannelPresenceSender.cpp @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Presence/StanzaChannelPresenceSender.h> + #include <Swiften/Client/StanzaChannel.h> namespace Swift { diff --git a/Swiften/Presence/SubscriptionManager.h b/Swiften/Presence/SubscriptionManager.h index 858702a..7bedba4 100644 --- a/Swiften/Presence/SubscriptionManager.h +++ b/Swiften/Presence/SubscriptionManager.h @@ -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,12 +7,12 @@ #pragma once #include <map> - #include <string> -#include <Swiften/JID/JID.h> + +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/Presence.h> -#include <Swiften/Base/API.h> +#include <Swiften/JID/JID.h> namespace Swift { class StanzaChannel; diff --git a/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp b/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp index b14c6d0..32f671e 100644 --- a/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp +++ b/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp @@ -1,18 +1,20 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/extensions/TestFactoryRegistry.h> #include <vector> + #include <boost/bind.hpp> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + +#include <Swiften/Client/DummyStanzaChannel.h> +#include <Swiften/Elements/Body.h> #include <Swiften/Presence/PayloadAddingPresenceSender.h> #include <Swiften/Presence/StanzaChannelPresenceSender.h> -#include <Swiften/Elements/Body.h> -#include <Swiften/Client/DummyStanzaChannel.h> using namespace Swift; |