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/MUC | |
| 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/MUC')
| -rw-r--r-- | Swiften/MUC/MUC.h | 24 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmark.h | 7 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.cpp | 8 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.h | 10 | ||||
| -rw-r--r-- | Swiften/MUC/MUCImpl.cpp | 12 | ||||
| -rw-r--r-- | Swiften/MUC/MUCImpl.h | 26 | ||||
| -rw-r--r-- | Swiften/MUC/MUCManager.cpp | 3 | ||||
| -rw-r--r-- | Swiften/MUC/UnitTest/MUCTest.cpp | 22 | ||||
| -rw-r--r-- | Swiften/MUC/UnitTest/MockMUC.h | 30 |
9 files changed, 73 insertions, 69 deletions
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h index 361dd7b..fbd7be6 100644 --- a/Swiften/MUC/MUC.h +++ b/Swiften/MUC/MUC.h @@ -1,27 +1,27 @@ /* - * 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 <Swiften/JID/JID.h> -#include <Swiften/Base/API.h> +#include <map> #include <string> -#include <Swiften/Elements/Message.h> -#include <Swiften/Elements/Presence.h> -#include <Swiften/Elements/MUCOccupant.h> -#include <Swiften/MUC/MUCRegistry.h> -#include <Swiften/Elements/MUCOwnerPayload.h> -#include <Swiften/Elements/MUCAdminPayload.h> -#include <Swiften/Elements/Form.h> #include <boost/shared_ptr.hpp> -#include <Swiften/Base/boost_bsignals.h> #include <boost/signals/connection.hpp> -#include <map> +#include <Swiften/Base/API.h> +#include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Elements/Form.h> +#include <Swiften/Elements/MUCAdminPayload.h> +#include <Swiften/Elements/MUCOccupant.h> +#include <Swiften/Elements/MUCOwnerPayload.h> +#include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> +#include <Swiften/JID/JID.h> +#include <Swiften/MUC/MUCRegistry.h> namespace Swift { class StanzaChannel; diff --git a/Swiften/MUC/MUCBookmark.h b/Swiften/MUC/MUCBookmark.h index cca44be..1f54a8f 100644 --- a/Swiften/MUC/MUCBookmark.h +++ b/Swiften/MUC/MUCBookmark.h @@ -1,17 +1,18 @@ /* - * 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 <string> + #include <boost/optional.hpp> -#include <string> #include <Swiften/Base/API.h> -#include <Swiften/JID/JID.h> #include <Swiften/Elements/Storage.h> +#include <Swiften/JID/JID.h> namespace Swift { class SWIFTEN_API MUCBookmark { diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp index 4eb2ae6..b109be2 100644 --- a/Swiften/MUC/MUCBookmarkManager.cpp +++ b/Swiften/MUC/MUCBookmarkManager.cpp @@ -1,21 +1,21 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "MUCBookmarkManager.h" +#include <Swiften/MUC/MUCBookmarkManager.h> + +#include <iostream> #include <boost/bind.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <iostream> #include <Swiften/Base/foreach.h> #include <Swiften/Queries/IQRouter.h> #include <Swiften/Queries/Requests/GetPrivateStorageRequest.h> #include <Swiften/Queries/Requests/SetPrivateStorageRequest.h> - namespace Swift { MUCBookmarkManager::MUCBookmarkManager(IQRouter* iqRouter) { diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h index 5163006..fb5d9f1 100644 --- a/Swiften/MUC/MUCBookmarkManager.h +++ b/Swiften/MUC/MUCBookmarkManager.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. */ @@ -8,14 +8,14 @@ #include <vector> -#include <boost/shared_ptr.hpp> -#include <Swiften/Base/boost_bsignals.h> #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> -#include <Swiften/MUC/MUCBookmark.h> -#include <Swiften/Elements/Storage.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Elements/Storage.h> +#include <Swiften/MUC/MUCBookmark.h> namespace Swift { class IQRouter; diff --git a/Swiften/MUC/MUCImpl.cpp b/Swiften/MUC/MUCImpl.cpp index 56e6e3f..774bf7a 100644 --- a/Swiften/MUC/MUCImpl.cpp +++ b/Swiften/MUC/MUCImpl.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. */ @@ -11,20 +11,20 @@ #include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/foreach.h> -#include <Swiften/Presence/DirectedPresenceSender.h> #include <Swiften/Client/StanzaChannel.h> -#include <Swiften/Queries/IQRouter.h> #include <Swiften/Elements/CapsInfo.h> #include <Swiften/Elements/Form.h> -#include <Swiften/Elements/Message.h> #include <Swiften/Elements/IQ.h> -#include <Swiften/Elements/MUCUserPayload.h> #include <Swiften/Elements/MUCAdminPayload.h> -#include <Swiften/Elements/MUCPayload.h> #include <Swiften/Elements/MUCDestroyPayload.h> #include <Swiften/Elements/MUCInvitationPayload.h> +#include <Swiften/Elements/MUCPayload.h> +#include <Swiften/Elements/MUCUserPayload.h> +#include <Swiften/Elements/Message.h> #include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/Presence/DirectedPresenceSender.h> #include <Swiften/Queries/GenericRequest.h> +#include <Swiften/Queries/IQRouter.h> namespace Swift { diff --git a/Swiften/MUC/MUCImpl.h b/Swiften/MUC/MUCImpl.h index 4e86c00..8103e69 100644 --- a/Swiften/MUC/MUCImpl.h +++ b/Swiften/MUC/MUCImpl.h @@ -1,28 +1,28 @@ /* - * 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 <Swiften/MUC/MUC.h> -#include <Swiften/JID/JID.h> -#include <Swiften/Base/API.h> +#include <map> #include <string> -#include <Swiften/Elements/Message.h> -#include <Swiften/Elements/Presence.h> -#include <Swiften/Elements/MUCOccupant.h> -#include <Swiften/MUC/MUCRegistry.h> -#include <Swiften/Elements/MUCOwnerPayload.h> -#include <Swiften/Elements/MUCAdminPayload.h> -#include <Swiften/Elements/Form.h> #include <boost/shared_ptr.hpp> -#include <Swiften/Base/boost_bsignals.h> #include <boost/signals/connection.hpp> -#include <map> +#include <Swiften/Base/API.h> +#include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Elements/Form.h> +#include <Swiften/Elements/MUCAdminPayload.h> +#include <Swiften/Elements/MUCOccupant.h> +#include <Swiften/Elements/MUCOwnerPayload.h> +#include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> +#include <Swiften/JID/JID.h> +#include <Swiften/MUC/MUC.h> +#include <Swiften/MUC/MUCRegistry.h> namespace Swift { class StanzaChannel; diff --git a/Swiften/MUC/MUCManager.cpp b/Swiften/MUC/MUCManager.cpp index 1c7f546..58a9a15 100644 --- a/Swiften/MUC/MUCManager.cpp +++ b/Swiften/MUC/MUCManager.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/MUC/MUCManager.h> + #include <Swiften/MUC/MUCImpl.h> namespace Swift { diff --git a/Swiften/MUC/UnitTest/MUCTest.cpp b/Swiften/MUC/UnitTest/MUCTest.cpp index ea71ff5..a422c12 100644 --- a/Swiften/MUC/UnitTest/MUCTest.cpp +++ b/Swiften/MUC/UnitTest/MUCTest.cpp @@ -1,25 +1,25 @@ /* - * Copyright (c) 2010-2014 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/MUC/MUCImpl.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + #include <Swiften/Client/DummyStanzaChannel.h> -#include <Swiften/Presence/StanzaChannelPresenceSender.h> -#include <Swiften/Presence/DirectedPresenceSender.h> -#include <Swiften/Queries/IQRouter.h> -#include <Swiften/Elements/MUCUserPayload.h> +#include <Swiften/Elements/CapsInfo.h> #include <Swiften/Elements/MUCOwnerPayload.h> +#include <Swiften/Elements/MUCUserPayload.h> #include <Swiften/Elements/VCard.h> -#include <Swiften/Elements/CapsInfo.h> - +#include <Swiften/MUC/MUCImpl.h> +#include <Swiften/Presence/DirectedPresenceSender.h> +#include <Swiften/Presence/StanzaChannelPresenceSender.h> +#include <Swiften/Queries/IQRouter.h> using namespace Swift; diff --git a/Swiften/MUC/UnitTest/MockMUC.h b/Swiften/MUC/UnitTest/MockMUC.h index 9c77e92..c54e738 100644 --- a/Swiften/MUC/UnitTest/MockMUC.h +++ b/Swiften/MUC/UnitTest/MockMUC.h @@ -1,26 +1,28 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/MUC/MUC.h> -#include <Swiften/MUC/MUCRegistry.h> -#include <Swiften/JID/JID.h> -#include <Swiften/Elements/Message.h> -#include <Swiften/Elements/Presence.h> -#include <Swiften/Elements/MUCOccupant.h> -#include <Swiften/Elements/MUCOwnerPayload.h> -#include <Swiften/Elements/MUCAdminPayload.h> -#include <Swiften/Elements/Form.h> +#include <map> +#include <string> + +#include <boost/shared_ptr.hpp> +#include <boost/signals/connection.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> -#include <boost/signals/connection.hpp> -#include <boost/shared_ptr.hpp> -#include <string> -#include <map> +#include <Swiften/Elements/Form.h> +#include <Swiften/Elements/MUCAdminPayload.h> +#include <Swiften/Elements/MUCOccupant.h> +#include <Swiften/Elements/MUCOwnerPayload.h> +#include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> +#include <Swiften/JID/JID.h> +#include <Swiften/MUC/MUC.h> +#include <Swiften/MUC/MUCRegistry.h> namespace Swift { class StanzaChannel; |