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/PubSub | |
| 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/PubSub')
| -rw-r--r-- | Swiften/PubSub/PubSubManager.h | 29 | ||||
| -rw-r--r-- | Swiften/PubSub/PubSubManagerImpl.h | 5 | ||||
| -rw-r--r-- | Swiften/PubSub/PubSubUtil.h | 3 |
3 files changed, 17 insertions, 20 deletions
diff --git a/Swiften/PubSub/PubSubManager.h b/Swiften/PubSub/PubSubManager.h index 7fc3820..572f244 100644 --- a/Swiften/PubSub/PubSubManager.h +++ b/Swiften/PubSub/PubSubManager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,32 +8,31 @@ #include <boost/shared_ptr.hpp> -#include <Swiften/Base/Override.h> #include <Swiften/Base/API.h> +#include <Swiften/Base/Override.h> #include <Swiften/Base/boost_bsignals.h> -#include <Swiften/Queries/PubSubRequest.h> -#include <Swiften/PubSub/PubSubUtil.h> +#include <Swiften/Elements/IQ.h> #include <Swiften/Elements/PubSub.h> -#include <Swiften/Elements/PubSubOwnerPubSub.h> -#include <Swiften/Elements/PubSubCreate.h> -#include <Swiften/Elements/PubSubSubscribe.h> #include <Swiften/Elements/PubSubAffiliations.h> +#include <Swiften/Elements/PubSubCreate.h> #include <Swiften/Elements/PubSubDefault.h> +#include <Swiften/Elements/PubSubEventPayload.h> #include <Swiften/Elements/PubSubItems.h> -#include <Swiften/Elements/PubSubPublish.h> -#include <Swiften/Elements/PubSubRetract.h> -#include <Swiften/Elements/PubSubSubscription.h> -#include <Swiften/Elements/PubSubSubscriptions.h> -#include <Swiften/Elements/PubSubUnsubscribe.h> #include <Swiften/Elements/PubSubOwnerAffiliations.h> #include <Swiften/Elements/PubSubOwnerConfigure.h> #include <Swiften/Elements/PubSubOwnerDefault.h> #include <Swiften/Elements/PubSubOwnerDelete.h> +#include <Swiften/Elements/PubSubOwnerPubSub.h> #include <Swiften/Elements/PubSubOwnerPurge.h> #include <Swiften/Elements/PubSubOwnerSubscriptions.h> -#include <Swiften/Elements/IQ.h> -#include <Swiften/Elements/PubSubEventPayload.h> - +#include <Swiften/Elements/PubSubPublish.h> +#include <Swiften/Elements/PubSubRetract.h> +#include <Swiften/Elements/PubSubSubscribe.h> +#include <Swiften/Elements/PubSubSubscription.h> +#include <Swiften/Elements/PubSubSubscriptions.h> +#include <Swiften/Elements/PubSubUnsubscribe.h> +#include <Swiften/PubSub/PubSubUtil.h> +#include <Swiften/Queries/PubSubRequest.h> #define SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST(payload, container, response) \ virtual boost::shared_ptr< PubSubRequest<payload> > \ createRequest(IQ::Type, const JID&, boost::shared_ptr<payload>) = 0; diff --git a/Swiften/PubSub/PubSubManagerImpl.h b/Swiften/PubSub/PubSubManagerImpl.h index d746aae..dda2920 100644 --- a/Swiften/PubSub/PubSubManagerImpl.h +++ b/Swiften/PubSub/PubSubManagerImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-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/Base/Override.h> #include <Swiften/Base/API.h> +#include <Swiften/Base/Override.h> #include <Swiften/PubSub/PubSubManager.h> - #define SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST(payload, container, response) \ virtual boost::shared_ptr< PubSubRequest<payload> > \ createRequest(IQ::Type type, const JID& receiver, boost::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \ diff --git a/Swiften/PubSub/PubSubUtil.h b/Swiften/PubSub/PubSubUtil.h index 7cc5a61..17e426b 100644 --- a/Swiften/PubSub/PubSubUtil.h +++ b/Swiften/PubSub/PubSubUtil.h @@ -1,11 +1,10 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once - #define SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE(action) \ action(PubSubCreate, PubSub, PubSubCreate) \ action(PubSubAffiliations, PubSub, PubSubAffiliations) \ |