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/Queries | |
| 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/Queries')
21 files changed, 95 insertions, 86 deletions
diff --git a/Swiften/Queries/IQChannel.h b/Swiften/Queries/IQChannel.h index 7f8e7dc..25f499e 100644 --- a/Swiften/Queries/IQChannel.h +++ b/Swiften/Queries/IQChannel.h @@ -1,16 +1,17 @@ /* - * Copyright (c) 2010 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 <string> + #include <boost/shared_ptr.hpp> -#include <string> #include <Swiften/Base/API.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/IQ.h> namespace Swift { diff --git a/Swiften/Queries/IQHandler.cpp b/Swiften/Queries/IQHandler.cpp index ec78ef6..bdfad30 100644 --- a/Swiften/Queries/IQHandler.cpp +++ b/Swiften/Queries/IQHandler.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/Queries/IQHandler.h> + #include <Swiften/Queries/IQRouter.h> namespace Swift { diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp index b6b957e..25ae3ac 100644 --- a/Swiften/Queries/IQRouter.cpp +++ b/Swiften/Queries/IQRouter.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. */ @@ -10,9 +10,9 @@ #include <Swiften/Base/Algorithm.h> #include <Swiften/Base/foreach.h> -#include <Swiften/Queries/IQHandler.h> -#include <Swiften/Queries/IQChannel.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Queries/IQChannel.h> +#include <Swiften/Queries/IQHandler.h> namespace Swift { diff --git a/Swiften/Queries/IQRouter.h b/Swiften/Queries/IQRouter.h index ac1beaf..2b83526 100644 --- a/Swiften/Queries/IQRouter.h +++ b/Swiften/Queries/IQRouter.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2010 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 <vector> #include <string> +#include <vector> + +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/IQ.h> diff --git a/Swiften/Queries/PubSubRequest.h b/Swiften/Queries/PubSubRequest.h index 9cf4404..c8a1a69 100644 --- a/Swiften/Queries/PubSubRequest.h +++ b/Swiften/Queries/PubSubRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -10,27 +10,27 @@ #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> -#include <Swiften/Queries/Request.h> #include <Swiften/Elements/ContainerPayload.h> -#include <Swiften/PubSub/PubSubUtil.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/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/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/Request.h> namespace Swift { namespace Detail { diff --git a/Swiften/Queries/RawRequest.h b/Swiften/Queries/RawRequest.h index 0d0336e..b267f58 100644 --- a/Swiften/Queries/RawRequest.h +++ b/Swiften/Queries/RawRequest.h @@ -1,19 +1,20 @@ /* - * Copyright (c) 2011-2015 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/smart_ptr/make_shared.hpp> #include <typeinfo> +#include <boost/smart_ptr/make_shared.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> -#include <Swiften/Queries/Request.h> -#include <Swiften/Elements/RawXMLPayload.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Elements/RawXMLPayload.h> +#include <Swiften/Queries/Request.h> #include <Swiften/Serializer/PayloadSerializer.h> #include <Swiften/Serializer/PayloadSerializers/ErrorSerializer.h> #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp index dec1dfa..8d2c9c4 100644 --- a/Swiften/Queries/Request.cpp +++ b/Swiften/Queries/Request.cpp @@ -1,13 +1,14 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Queries/Request.h> -#include <Swiften/Queries/IQRouter.h> -#include <Swiften/Elements/RawXMLPayload.h> + #include <Swiften/Base/Log.h> +#include <Swiften/Elements/RawXMLPayload.h> +#include <Swiften/Queries/IQRouter.h> namespace Swift { diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h index 707f81e..71bbef2 100644 --- a/Swiften/Queries/Request.h +++ b/Swiften/Queries/Request.h @@ -1,22 +1,23 @@ /* - * Copyright (c) 2010 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 <boost/optional.hpp> -#include <boost/enable_shared_from_this.hpp> #include <string> +#include <boost/enable_shared_from_this.hpp> +#include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Queries/IQHandler.h> +#include <Swiften/Elements/ErrorPayload.h> #include <Swiften/Elements/IQ.h> #include <Swiften/Elements/Payload.h> -#include <Swiften/Elements/ErrorPayload.h> #include <Swiften/JID/JID.h> +#include <Swiften/Queries/IQHandler.h> namespace Swift { /** diff --git a/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h index b952875..faea191 100644 --- a/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h +++ b/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.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. */ @@ -7,8 +7,8 @@ #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Queries/GenericRequest.h> #include <Swiften/Elements/InBandRegistrationPayload.h> +#include <Swiften/Queries/GenericRequest.h> namespace Swift { class SWIFTEN_API GetInBandRegistrationFormRequest : public GenericRequest<InBandRegistrationPayload> { diff --git a/Swiften/Queries/Requests/GetPrivateStorageRequest.h b/Swiften/Queries/Requests/GetPrivateStorageRequest.h index 97711a6..a2e7bde 100644 --- a/Swiften/Queries/Requests/GetPrivateStorageRequest.h +++ b/Swiften/Queries/Requests/GetPrivateStorageRequest.h @@ -1,19 +1,19 @@ /* - * 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/smart_ptr/make_shared.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Queries/Request.h> -#include <Swiften/Elements/PrivateStorage.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Elements/PrivateStorage.h> +#include <Swiften/Queries/Request.h> namespace Swift { template<typename PAYLOAD_TYPE> diff --git a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h index 7a76fcc..34e2cfb 100644 --- a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h +++ b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.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,9 +9,8 @@ #include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Queries/GenericRequest.h> #include <Swiften/Elements/SecurityLabelsCatalog.h> - +#include <Swiften/Queries/GenericRequest.h> namespace Swift { class SWIFTEN_API GetSecurityLabelsCatalogRequest : public GenericRequest<SecurityLabelsCatalog> { diff --git a/Swiften/Queries/Requests/GetSoftwareVersionRequest.h b/Swiften/Queries/Requests/GetSoftwareVersionRequest.h index 1084a0b..b8e568a 100644 --- a/Swiften/Queries/Requests/GetSoftwareVersionRequest.h +++ b/Swiften/Queries/Requests/GetSoftwareVersionRequest.h @@ -1,16 +1,16 @@ /* - * 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/API.h> -#include <Swiften/Queries/GenericRequest.h> -#include <Swiften/Elements/SoftwareVersion.h> #include <boost/smart_ptr/make_shared.hpp> +#include <Swiften/Base/API.h> +#include <Swiften/Elements/SoftwareVersion.h> +#include <Swiften/Queries/GenericRequest.h> namespace Swift { class SWIFTEN_API GetSoftwareVersionRequest : public GenericRequest<SoftwareVersion> { diff --git a/Swiften/Queries/Requests/SetPrivateStorageRequest.h b/Swiften/Queries/Requests/SetPrivateStorageRequest.h index 9ab65f7..46620c3 100644 --- a/Swiften/Queries/Requests/SetPrivateStorageRequest.h +++ b/Swiften/Queries/Requests/SetPrivateStorageRequest.h @@ -1,19 +1,19 @@ /* - * 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/smart_ptr/make_shared.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Queries/Request.h> -#include <Swiften/Elements/PrivateStorage.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Elements/PrivateStorage.h> +#include <Swiften/Queries/Request.h> namespace Swift { template<typename PAYLOAD_TYPE> diff --git a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h index e79562a..220e2ba 100644 --- a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h +++ b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h @@ -1,18 +1,17 @@ /* - * 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 <Swiften/Base/API.h> -#include <Swiften/Queries/Request.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/InBandRegistrationPayload.h> - +#include <Swiften/Queries/Request.h> namespace Swift { class SWIFTEN_API SetInBandRegistrationRequest : public Request { diff --git a/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp b/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp index 5b0a704..4e3be50 100644 --- a/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp +++ b/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp @@ -1,18 +1,19 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <boost/bind.hpp> +#include <boost/shared_ptr.hpp> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/shared_ptr.hpp> -#include <boost/bind.hpp> -#include <Swiften/Queries/Requests/GetPrivateStorageRequest.h> -#include <Swiften/Queries/IQRouter.h> -#include <Swiften/Queries/DummyIQChannel.h> #include <Swiften/Elements/Payload.h> +#include <Swiften/Queries/DummyIQChannel.h> +#include <Swiften/Queries/IQRouter.h> +#include <Swiften/Queries/Requests/GetPrivateStorageRequest.h> using namespace Swift; diff --git a/Swiften/Queries/Responder.h b/Swiften/Queries/Responder.h index 8a201e6..836207f 100644 --- a/Swiften/Queries/Responder.h +++ b/Swiften/Queries/Responder.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/API.h> +#include <Swiften/Elements/ErrorPayload.h> #include <Swiften/Queries/IQHandler.h> #include <Swiften/Queries/IQRouter.h> -#include <Swiften/Elements/ErrorPayload.h> namespace Swift { /** diff --git a/Swiften/Queries/Responders/SoftwareVersionResponder.cpp b/Swiften/Queries/Responders/SoftwareVersionResponder.cpp index 6c10a2b..491f639 100644 --- a/Swiften/Queries/Responders/SoftwareVersionResponder.cpp +++ b/Swiften/Queries/Responders/SoftwareVersionResponder.cpp @@ -1,12 +1,13 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Swiften/Queries/Responders/SoftwareVersionResponder.h> + #include <boost/smart_ptr/make_shared.hpp> -#include <Swiften/Queries/Responders/SoftwareVersionResponder.h> #include <Swiften/Queries/IQRouter.h> namespace Swift { diff --git a/Swiften/Queries/Responders/SoftwareVersionResponder.h b/Swiften/Queries/Responders/SoftwareVersionResponder.h index 4418333..5684acb 100644 --- a/Swiften/Queries/Responders/SoftwareVersionResponder.h +++ b/Swiften/Queries/Responders/SoftwareVersionResponder.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/Queries/GetResponder.h> #include <Swiften/Elements/SoftwareVersion.h> +#include <Swiften/Queries/GetResponder.h> namespace Swift { class IQRouter; diff --git a/Swiften/Queries/UnitTest/IQRouterTest.cpp b/Swiften/Queries/UnitTest/IQRouterTest.cpp index 660e632..44315c4 100644 --- a/Swiften/Queries/UnitTest/IQRouterTest.cpp +++ b/Swiften/Queries/UnitTest/IQRouterTest.cpp @@ -1,18 +1,19 @@ /* - * 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 <boost/bind.hpp> #include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <boost/bind.hpp> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + +#include <Swiften/Queries/DummyIQChannel.h> #include <Swiften/Queries/IQHandler.h> #include <Swiften/Queries/IQRouter.h> -#include <Swiften/Queries/DummyIQChannel.h> using namespace Swift; diff --git a/Swiften/Queries/UnitTest/RequestTest.cpp b/Swiften/Queries/UnitTest/RequestTest.cpp index 46532f5..2fd5867 100644 --- a/Swiften/Queries/UnitTest/RequestTest.cpp +++ b/Swiften/Queries/UnitTest/RequestTest.cpp @@ -1,20 +1,21 @@ /* - * 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 <boost/shared_ptr.hpp> #include <boost/bind.hpp> +#include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <Swiften/Queries/GenericRequest.h> -#include <Swiften/Queries/IQRouter.h> -#include <Swiften/Queries/DummyIQChannel.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + #include <Swiften/Elements/Payload.h> #include <Swiften/Elements/RawXMLPayload.h> +#include <Swiften/Queries/DummyIQChannel.h> +#include <Swiften/Queries/GenericRequest.h> +#include <Swiften/Queries/IQRouter.h> using namespace Swift; diff --git a/Swiften/Queries/UnitTest/ResponderTest.cpp b/Swiften/Queries/UnitTest/ResponderTest.cpp index 4664eb9..42d8651 100644 --- a/Swiften/Queries/UnitTest/ResponderTest.cpp +++ b/Swiften/Queries/UnitTest/ResponderTest.cpp @@ -1,19 +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 <boost/bind.hpp> #include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <boost/bind.hpp> -#include <Swiften/Queries/Responder.h> -#include <Swiften/Queries/IQRouter.h> -#include <Swiften/Queries/DummyIQChannel.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + #include <Swiften/Elements/SoftwareVersion.h> +#include <Swiften/Queries/DummyIQChannel.h> +#include <Swiften/Queries/IQRouter.h> +#include <Swiften/Queries/Responder.h> using namespace Swift; |