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 /Sluift | |
| 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 'Sluift')
92 files changed, 393 insertions, 305 deletions
diff --git a/Sluift/Console.cpp b/Sluift/Console.cpp index 113e07b..623a38f 100644 --- a/Sluift/Console.cpp +++ b/Sluift/Console.cpp @@ -1,21 +1,25 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/Console.h> -#include <lua.hpp> -#include <stdexcept> + +#include <cctype> #include <iostream> -#include <boost/optional.hpp> -#include <boost/lexical_cast.hpp> +#include <stdexcept> + #include <boost/algorithm/string/predicate.hpp> +#include <boost/lexical_cast.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/optional.hpp> + +#include <lua.hpp> + +#include <Sluift/Lua/LuaUtils.h> #include <Sluift/Terminal.h> #include <Sluift/tokenize.h> -#include <Sluift/Lua/LuaUtils.h> -#include <cctype> using namespace Swift; diff --git a/Sluift/Console.h b/Sluift/Console.h index 8c93b2d..4f444fe 100644 --- a/Sluift/Console.h +++ b/Sluift/Console.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. */ @@ -7,10 +7,13 @@ #pragma once #include <string> + #include <boost/optional/optional_fwd.hpp> -#include <Sluift/Completer.h> + #include <Swiften/Base/Override.h> +#include <Sluift/Completer.h> + struct lua_State; namespace Swift { diff --git a/Sluift/EditlineTerminal.cpp b/Sluift/EditlineTerminal.cpp index 8d1aac8..4d48bd7 100644 --- a/Sluift/EditlineTerminal.cpp +++ b/Sluift/EditlineTerminal.cpp @@ -1,20 +1,23 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/EditlineTerminal.h> -#include <boost/optional.hpp> -#include <iostream> -#include <editline/readline.h> -#include <boost/numeric/conversion/cast.hpp> #include <cassert> -#include <vector> #include <cstring> +#include <iostream> +#include <vector> + +#include <boost/numeric/conversion/cast.hpp> +#include <boost/optional.hpp> + +#include <editline/readline.h> #include <Swiften/Base/Platform.h> + #include <Sluift/Completer.h> using namespace Swift; diff --git a/Sluift/EditlineTerminal.h b/Sluift/EditlineTerminal.h index 3608096..3919c46 100644 --- a/Sluift/EditlineTerminal.h +++ b/Sluift/EditlineTerminal.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. */ @@ -7,6 +7,7 @@ #pragma once #include <Swiften/Base/Override.h> + #include <Sluift/Terminal.h> namespace Swift { diff --git a/Sluift/ElementConvertors/BodyConvertor.cpp b/Sluift/ElementConvertors/BodyConvertor.cpp index 35f1a72..8c1a6cd 100644 --- a/Sluift/ElementConvertors/BodyConvertor.cpp +++ b/Sluift/ElementConvertors/BodyConvertor.cpp @@ -1,13 +1,15 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/BodyConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/BodyConvertor.h b/Sluift/ElementConvertors/BodyConvertor.h index c9d922b..6b7b3c7 100644 --- a/Sluift/ElementConvertors/BodyConvertor.h +++ b/Sluift/ElementConvertors/BodyConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Body.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Body.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/CommandConvertor.cpp b/Sluift/ElementConvertors/CommandConvertor.cpp index c9fc952..d3a8739 100644 --- a/Sluift/ElementConvertors/CommandConvertor.cpp +++ b/Sluift/ElementConvertors/CommandConvertor.cpp @@ -1,16 +1,18 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/CommandConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> #include <Swiften/Base/foreach.h> + #include <Sluift/Lua/Check.h> #include <Sluift/Lua/Value.h> #include <Sluift/LuaElementConvertors.h> diff --git a/Sluift/ElementConvertors/CommandConvertor.h b/Sluift/ElementConvertors/CommandConvertor.h index 868fe5e..e129fd9 100644 --- a/Sluift/ElementConvertors/CommandConvertor.h +++ b/Sluift/ElementConvertors/CommandConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Command.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Command.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/DOMElementConvertor.cpp b/Sluift/ElementConvertors/DOMElementConvertor.cpp index 6ed214d..347bbfd 100644 --- a/Sluift/ElementConvertors/DOMElementConvertor.cpp +++ b/Sluift/ElementConvertors/DOMElementConvertor.cpp @@ -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. */ @@ -7,22 +7,25 @@ #include <Sluift/ElementConvertors/DOMElementConvertor.h> #include <iostream> + #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> #include <Swiften/Base/foreach.h> #include <Swiften/Elements/RawXMLPayload.h> -#include <Swiften/Serializer/PayloadSerializer.h> -#include <Sluift/Lua/Check.h> -#include <Sluift/Lua/LuaUtils.h> -#include <Swiften/Parser/XMLParserClient.h> -#include <Swiften/Parser/XMLParser.h> -#include <Swiften/Parser/AttributeMap.h> #include <Swiften/Parser/Attribute.h> +#include <Swiften/Parser/AttributeMap.h> +#include <Swiften/Parser/XMLParser.h> +#include <Swiften/Parser/XMLParserClient.h> +#include <Swiften/Serializer/PayloadSerializer.h> #include <Swiften/Serializer/XML/XMLElement.h> -#include <Swiften/Serializer/XML/XMLTextNode.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> +#include <Swiften/Serializer/XML/XMLTextNode.h> + +#include <Sluift/Lua/Check.h> #include <Sluift/Lua/Debug.h> +#include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/DOMElementConvertor.h b/Sluift/ElementConvertors/DOMElementConvertor.h index 610dbff..550bc3b 100644 --- a/Sluift/ElementConvertors/DOMElementConvertor.h +++ b/Sluift/ElementConvertors/DOMElementConvertor.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. */ @@ -7,10 +7,10 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Parser/PlatformXMLParserFactory.h> +#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Sluift/LuaElementConvertor.h> -#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> -#include <Swiften/Parser/PlatformXMLParserFactory.h> namespace Swift { class DOMElementConvertor : public LuaElementConvertor { diff --git a/Sluift/ElementConvertors/DefaultElementConvertor.cpp b/Sluift/ElementConvertors/DefaultElementConvertor.cpp index c95da93..a1e27fa 100644 --- a/Sluift/ElementConvertors/DefaultElementConvertor.cpp +++ b/Sluift/ElementConvertors/DefaultElementConvertor.cpp @@ -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. */ @@ -7,8 +7,8 @@ #include <Sluift/ElementConvertors/DefaultElementConvertor.h> #include <iostream> -#include <typeinfo> #include <string> +#include <typeinfo> using namespace Swift; diff --git a/Sluift/ElementConvertors/DelayConvertor.cpp b/Sluift/ElementConvertors/DelayConvertor.cpp index a17e114..a2ea132 100644 --- a/Sluift/ElementConvertors/DelayConvertor.cpp +++ b/Sluift/ElementConvertors/DelayConvertor.cpp @@ -1,17 +1,20 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/DelayConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <Sluift/Lua/Check.h> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Swiften/Base/DateTime.h> +#include <Sluift/Lua/Check.h> + using namespace Swift; DelayConvertor::DelayConvertor() : GenericLuaElementConvertor<Delay>("delay") { diff --git a/Sluift/ElementConvertors/DelayConvertor.h b/Sluift/ElementConvertors/DelayConvertor.h index 6cee7de..fed032f 100644 --- a/Sluift/ElementConvertors/DelayConvertor.h +++ b/Sluift/ElementConvertors/DelayConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Delay.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Delay.h> namespace Swift { class DelayConvertor : public GenericLuaElementConvertor<Delay> { diff --git a/Sluift/ElementConvertors/DiscoInfoConvertor.cpp b/Sluift/ElementConvertors/DiscoInfoConvertor.cpp index d9a408e..4ebd6a3 100644 --- a/Sluift/ElementConvertors/DiscoInfoConvertor.cpp +++ b/Sluift/ElementConvertors/DiscoInfoConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/DiscoInfoConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/DiscoInfoConvertor.h b/Sluift/ElementConvertors/DiscoInfoConvertor.h index 7c5009f..4f397b0 100644 --- a/Sluift/ElementConvertors/DiscoInfoConvertor.h +++ b/Sluift/ElementConvertors/DiscoInfoConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/DiscoInfo.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/DiscoInfo.h> namespace Swift { class DiscoInfoConvertor : public GenericLuaElementConvertor<DiscoInfo> { diff --git a/Sluift/ElementConvertors/DiscoItemsConvertor.cpp b/Sluift/ElementConvertors/DiscoItemsConvertor.cpp index 6ec944a..a01fa7e 100644 --- a/Sluift/ElementConvertors/DiscoItemsConvertor.cpp +++ b/Sluift/ElementConvertors/DiscoItemsConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/DiscoItemsConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/DiscoItemsConvertor.h b/Sluift/ElementConvertors/DiscoItemsConvertor.h index 5e3a86c..a1261a4 100644 --- a/Sluift/ElementConvertors/DiscoItemsConvertor.h +++ b/Sluift/ElementConvertors/DiscoItemsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/DiscoItems.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/DiscoItems.h> namespace Swift { class DiscoItemsConvertor : public GenericLuaElementConvertor<DiscoItems> { diff --git a/Sluift/ElementConvertors/FormConvertor.cpp b/Sluift/ElementConvertors/FormConvertor.cpp index be1015c..d1617b6 100644 --- a/Sluift/ElementConvertors/FormConvertor.cpp +++ b/Sluift/ElementConvertors/FormConvertor.cpp @@ -1,19 +1,23 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/FormConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> +#include <sstream> + +#include <boost/assign/list_of.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + +#include <Swiften/Base/foreach.h> + #include <Sluift/Lua/Check.h> #include <Sluift/Lua/Value.h> -#include <Swiften/Base/foreach.h> -#include <boost/assign/list_of.hpp> -#include <sstream> using namespace Swift; diff --git a/Sluift/ElementConvertors/FormConvertor.h b/Sluift/ElementConvertors/FormConvertor.h index 3c1542f..af9020d 100644 --- a/Sluift/ElementConvertors/FormConvertor.h +++ b/Sluift/ElementConvertors/FormConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Form.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Form.h> namespace Swift { class FormConvertor : public GenericLuaElementConvertor<Form> { diff --git a/Sluift/ElementConvertors/ForwardedConvertor.h b/Sluift/ElementConvertors/ForwardedConvertor.h index a7d2586..6c4848a 100644 --- a/Sluift/ElementConvertors/ForwardedConvertor.h +++ b/Sluift/ElementConvertors/ForwardedConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/GenericLuaElementConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/Forwarded.h> +#include <Sluift/GenericLuaElementConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/IQConvertor.h b/Sluift/ElementConvertors/IQConvertor.h index b5351b7..68bda38 100644 --- a/Sluift/ElementConvertors/IQConvertor.h +++ b/Sluift/ElementConvertors/IQConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/ElementConvertors/StanzaConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/IQ.h> +#include <Sluift/ElementConvertors/StanzaConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h index 5af4944..bcbeb40 100644 --- a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h +++ b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/IsodeIQDelegation.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/IsodeIQDelegation.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/MAMFinConvertor.h b/Sluift/ElementConvertors/MAMFinConvertor.h index 4021c00..1727403 100644 --- a/Sluift/ElementConvertors/MAMFinConvertor.h +++ b/Sluift/ElementConvertors/MAMFinConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/GenericLuaElementConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/MAMFin.h> +#include <Sluift/GenericLuaElementConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/MAMQueryConvertor.h b/Sluift/ElementConvertors/MAMQueryConvertor.h index 5169607..e839a24 100644 --- a/Sluift/ElementConvertors/MAMQueryConvertor.h +++ b/Sluift/ElementConvertors/MAMQueryConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/GenericLuaElementConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/MAMQuery.h> +#include <Sluift/GenericLuaElementConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/MAMResultConvertor.h b/Sluift/ElementConvertors/MAMResultConvertor.h index 65d430a..49b14e2 100644 --- a/Sluift/ElementConvertors/MAMResultConvertor.h +++ b/Sluift/ElementConvertors/MAMResultConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/GenericLuaElementConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/MAMResult.h> +#include <Sluift/GenericLuaElementConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/MessageConvertor.h b/Sluift/ElementConvertors/MessageConvertor.h index f0da885..92efea3 100644 --- a/Sluift/ElementConvertors/MessageConvertor.h +++ b/Sluift/ElementConvertors/MessageConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/ElementConvertors/StanzaConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/Message.h> +#include <Sluift/ElementConvertors/StanzaConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PresenceConvertor.h b/Sluift/ElementConvertors/PresenceConvertor.h index fc4326e..c919f3a 100644 --- a/Sluift/ElementConvertors/PresenceConvertor.h +++ b/Sluift/ElementConvertors/PresenceConvertor.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Sluift/ElementConvertors/StanzaConvertor.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/Presence.h> +#include <Sluift/ElementConvertors/StanzaConvertor.h> + namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h index f398436..b98ff4c 100644 --- a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h +++ b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubAffiliations.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubAffiliations.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubConfigureConvertor.h b/Sluift/ElementConvertors/PubSubConfigureConvertor.h index 4fc57b2..27aa906 100644 --- a/Sluift/ElementConvertors/PubSubConfigureConvertor.h +++ b/Sluift/ElementConvertors/PubSubConfigureConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubConfigure.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubConfigure.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubCreateConvertor.h b/Sluift/ElementConvertors/PubSubCreateConvertor.h index a4bf149..bcf06af 100644 --- a/Sluift/ElementConvertors/PubSubCreateConvertor.h +++ b/Sluift/ElementConvertors/PubSubCreateConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubCreate.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubCreate.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h index 4226619..38ffd64 100644 --- a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventCollection.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventCollection.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h index ce76da4..7e8ea02 100644 --- a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventConfiguration.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventConfiguration.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventConvertor.h b/Sluift/ElementConvertors/PubSubEventConvertor.h index 3bb4594..ab19c8f 100644 --- a/Sluift/ElementConvertors/PubSubEventConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEvent.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEvent.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h index e229781..c8ff8cd 100644 --- a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventDelete.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventDelete.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventItemConvertor.h b/Sluift/ElementConvertors/PubSubEventItemConvertor.h index c7dac83..7dfeef6 100644 --- a/Sluift/ElementConvertors/PubSubEventItemConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventItemConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventItem.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventItem.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h b/Sluift/ElementConvertors/PubSubEventItemsConvertor.h index c409a3c..347200e 100644 --- a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventItemsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventItems.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventItems.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubItemConvertor.h b/Sluift/ElementConvertors/PubSubItemConvertor.h index 334c15c..7f4adbf 100644 --- a/Sluift/ElementConvertors/PubSubItemConvertor.h +++ b/Sluift/ElementConvertors/PubSubItemConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubItem.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubItem.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.h b/Sluift/ElementConvertors/PubSubItemsConvertor.h index 801c2d8..04943ac 100644 --- a/Sluift/ElementConvertors/PubSubItemsConvertor.h +++ b/Sluift/ElementConvertors/PubSubItemsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubItems.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubItems.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.h b/Sluift/ElementConvertors/PubSubOptionsConvertor.h index 8aacdbd..a0ec68e 100644 --- a/Sluift/ElementConvertors/PubSubOptionsConvertor.h +++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOptions.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOptions.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h index 63ed4a7..f64426a 100644 --- a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerAffiliations.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerAffiliations.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h index d02336d..7555922 100644 --- a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerConfigure.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerConfigure.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h index 932c3ae..d51223a 100644 --- a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerDefault.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerDefault.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h index a48dcf9..4673b92 100644 --- a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerDelete.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerDelete.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h index dbdff67..b1793e3 100644 --- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerSubscriptions.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerSubscriptions.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubPublishConvertor.h b/Sluift/ElementConvertors/PubSubPublishConvertor.h index 6deda0e..d886368 100644 --- a/Sluift/ElementConvertors/PubSubPublishConvertor.h +++ b/Sluift/ElementConvertors/PubSubPublishConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubPublish.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubPublish.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubRetractConvertor.h b/Sluift/ElementConvertors/PubSubRetractConvertor.h index 46aa71b..6b27ac7 100644 --- a/Sluift/ElementConvertors/PubSubRetractConvertor.h +++ b/Sluift/ElementConvertors/PubSubRetractConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubRetract.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubRetract.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h b/Sluift/ElementConvertors/PubSubSubscribeConvertor.h index 5a7aefe..a7eac09 100644 --- a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h +++ b/Sluift/ElementConvertors/PubSubSubscribeConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubSubscribe.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubSubscribe.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h index 6d09ddf..7c1b213 100644 --- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h +++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubSubscription.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubSubscription.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h index 70fc159..de5e9f4 100644 --- a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h +++ b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubSubscriptions.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubSubscriptions.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp index e859079..1b26e74 100644 --- a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp +++ b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp @@ -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. */ @@ -7,11 +7,14 @@ #include <Sluift/ElementConvertors/RawXMLElementConvertor.h> #include <iostream> + #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> #include <Swiften/Elements/RawXMLPayload.h> #include <Swiften/Serializer/PayloadSerializer.h> + #include <Sluift/Lua/Check.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.h b/Sluift/ElementConvertors/RawXMLElementConvertor.h index 98be763..0a3b463 100644 --- a/Sluift/ElementConvertors/RawXMLElementConvertor.h +++ b/Sluift/ElementConvertors/RawXMLElementConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Sluift/LuaElementConvertor.h> -#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> namespace Swift { class RawXMLElementConvertor : public LuaElementConvertor { diff --git a/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp b/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp index d621593..9ac1679 100644 --- a/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp +++ b/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/SoftwareVersionConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/Check.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/SoftwareVersionConvertor.h b/Sluift/ElementConvertors/SoftwareVersionConvertor.h index aded40a..77b2ad6 100644 --- a/Sluift/ElementConvertors/SoftwareVersionConvertor.h +++ b/Sluift/ElementConvertors/SoftwareVersionConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/SoftwareVersion.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/SoftwareVersion.h> namespace Swift { class SoftwareVersionConvertor : public GenericLuaElementConvertor<SoftwareVersion> { diff --git a/Sluift/ElementConvertors/StanzaConvertor.h b/Sluift/ElementConvertors/StanzaConvertor.h index b3e75cf..420232a 100644 --- a/Sluift/ElementConvertors/StanzaConvertor.h +++ b/Sluift/ElementConvertors/StanzaConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,14 +8,15 @@ #include <boost/numeric/conversion/cast.hpp> -#include <Sluift/GenericLuaElementConvertor.h> -#include <Sluift/LuaElementConvertors.h> -#include <Sluift/Lua/Exception.h> #include <Swiften/Base/foreach.h> -#include <Swiften/Elements/Payload.h> #include <Swiften/Elements/IQ.h> -#include <Swiften/Elements/Presence.h> #include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Payload.h> +#include <Swiften/Elements/Presence.h> + +#include <Sluift/GenericLuaElementConvertor.h> +#include <Sluift/Lua/Exception.h> +#include <Sluift/LuaElementConvertors.h> namespace Swift { template <typename T> class StanzaConvertor : public GenericLuaElementConvertor<T> { diff --git a/Sluift/ElementConvertors/StatusConvertor.cpp b/Sluift/ElementConvertors/StatusConvertor.cpp index 9dc3585..575a4ea 100644 --- a/Sluift/ElementConvertors/StatusConvertor.cpp +++ b/Sluift/ElementConvertors/StatusConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/StatusConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/Check.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/StatusConvertor.h b/Sluift/ElementConvertors/StatusConvertor.h index 2e39f27..33fe861 100644 --- a/Sluift/ElementConvertors/StatusConvertor.h +++ b/Sluift/ElementConvertors/StatusConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Status.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Status.h> namespace Swift { class StatusConvertor : public GenericLuaElementConvertor<Status> { diff --git a/Sluift/ElementConvertors/StatusShowConvertor.cpp b/Sluift/ElementConvertors/StatusShowConvertor.cpp index 43098ef..faae289 100644 --- a/Sluift/ElementConvertors/StatusShowConvertor.cpp +++ b/Sluift/ElementConvertors/StatusShowConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/StatusShowConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/Check.h> #include <Sluift/Lua/Exception.h> diff --git a/Sluift/ElementConvertors/StatusShowConvertor.h b/Sluift/ElementConvertors/StatusShowConvertor.h index 6447c4e..d71493d 100644 --- a/Sluift/ElementConvertors/StatusShowConvertor.h +++ b/Sluift/ElementConvertors/StatusShowConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/StatusShow.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/StatusShow.h> namespace Swift { class StatusShowConvertor : public GenericLuaElementConvertor<StatusShow> { diff --git a/Sluift/ElementConvertors/SubjectConvertor.cpp b/Sluift/ElementConvertors/SubjectConvertor.cpp index 893073f..8f15515 100644 --- a/Sluift/ElementConvertors/SubjectConvertor.cpp +++ b/Sluift/ElementConvertors/SubjectConvertor.cpp @@ -1,13 +1,15 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/SubjectConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/SubjectConvertor.h b/Sluift/ElementConvertors/SubjectConvertor.h index d517b1e..5969293 100644 --- a/Sluift/ElementConvertors/SubjectConvertor.h +++ b/Sluift/ElementConvertors/SubjectConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/Subject.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/Subject.h> namespace Swift { class LuaElementConvertors; diff --git a/Sluift/ElementConvertors/VCardConvertor.cpp b/Sluift/ElementConvertors/VCardConvertor.cpp index 451e0ab..f704083 100644 --- a/Sluift/ElementConvertors/VCardConvertor.cpp +++ b/Sluift/ElementConvertors/VCardConvertor.cpp @@ -1,18 +1,21 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/VCardConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <Sluift/Lua/LuaUtils.h> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Swiften/Base/ByteArray.h> #include <Swiften/Base/DateTime.h> +#include <Sluift/Lua/LuaUtils.h> + using namespace Swift; VCardConvertor::VCardConvertor() : GenericLuaElementConvertor<VCard>("vcard") { diff --git a/Sluift/ElementConvertors/VCardConvertor.h b/Sluift/ElementConvertors/VCardConvertor.h index 135eff0..39e9dda 100644 --- a/Sluift/ElementConvertors/VCardConvertor.h +++ b/Sluift/ElementConvertors/VCardConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/VCard.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/VCard.h> namespace Swift { class VCardConvertor : public GenericLuaElementConvertor<VCard> { diff --git a/Sluift/ElementConvertors/VCardUpdateConvertor.cpp b/Sluift/ElementConvertors/VCardUpdateConvertor.cpp index 579f064..b13443d 100644 --- a/Sluift/ElementConvertors/VCardUpdateConvertor.cpp +++ b/Sluift/ElementConvertors/VCardUpdateConvertor.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/VCardUpdateConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> + +#include <lua.hpp> + #include <Sluift/Lua/LuaUtils.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/VCardUpdateConvertor.h b/Sluift/ElementConvertors/VCardUpdateConvertor.h index b6ffac7..48c1be8 100644 --- a/Sluift/ElementConvertors/VCardUpdateConvertor.h +++ b/Sluift/ElementConvertors/VCardUpdateConvertor.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. */ @@ -7,9 +7,9 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/VCardUpdate.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/VCardUpdate.h> namespace Swift { class VCardUpdateConvertor : public GenericLuaElementConvertor<VCardUpdate> { diff --git a/Sluift/GenericLuaElementConvertor.h b/Sluift/GenericLuaElementConvertor.h index 430e2b5..8574f14 100644 --- a/Sluift/GenericLuaElementConvertor.h +++ b/Sluift/GenericLuaElementConvertor.h @@ -1,18 +1,20 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <lua.hpp> #include <string> +#include <lua.hpp> + #include <Swiften/Base/Override.h> -#include <Sluift/LuaElementConvertor.h> + #include <Sluift/Lua/Check.h> #include <Sluift/Lua/LuaUtils.h> +#include <Sluift/LuaElementConvertor.h> namespace Swift { template<typename T> diff --git a/Sluift/Helpers.h b/Sluift/Helpers.h index 290508a..ebf50f1 100644 --- a/Sluift/Helpers.h +++ b/Sluift/Helpers.h @@ -1,16 +1,16 @@ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Base/Override.h> -#include <Swiften/Base/API.h> - #include <string> +#include <Swiften/Base/API.h> +#include <Swiften/Base/Override.h> + namespace Swift { class ClientError; class ComponentError; diff --git a/Sluift/ITunesInterface.h b/Sluift/ITunesInterface.h index e854da4..8862966 100644 --- a/Sluift/ITunesInterface.h +++ b/Sluift/ITunesInterface.h @@ -1,15 +1,15 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Base/API.h> - -#include <boost/shared_ptr.hpp> #include <boost/optional/optional_fwd.hpp> +#include <boost/shared_ptr.hpp> + +#include <Swiften/Base/API.h> namespace Swift { class SWIFTEN_API ITunesInterface { diff --git a/Sluift/Lua/Check.cpp b/Sluift/Lua/Check.cpp index 9a4951e..4eebf4f 100644 --- a/Sluift/Lua/Check.cpp +++ b/Sluift/Lua/Check.cpp @@ -1,19 +1,22 @@ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/Lua/Check.h> -#include <boost/numeric/conversion/cast.hpp> #include <iostream> #include <sstream> + +#include <boost/numeric/conversion/cast.hpp> + #include <lua.hpp> -#include <Sluift/Lua/Exception.h> #include <Swiften/Base/ByteArray.h> +#include <Sluift/Lua/Exception.h> + using namespace Swift; diff --git a/Sluift/Lua/Debug.h b/Sluift/Lua/Debug.h index 368672d..32addd6 100644 --- a/Sluift/Lua/Debug.h +++ b/Sluift/Lua/Debug.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <lua.hpp> #include <iostream> +#include <lua.hpp> + namespace Swift { namespace Lua { inline void dumpStack(lua_State *L) { diff --git a/Sluift/Lua/Exception.h b/Sluift/Lua/Exception.h index a681b9c..0d327e0 100644 --- a/Sluift/Lua/Exception.h +++ b/Sluift/Lua/Exception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,6 +7,7 @@ #pragma once #include <stdexcept> + #include <Swiften/Base/API.h> namespace Swift { diff --git a/Sluift/Lua/FunctionRegistration.h b/Sluift/Lua/FunctionRegistration.h index cc43d35..3f0afbb 100644 --- a/Sluift/Lua/FunctionRegistration.h +++ b/Sluift/Lua/FunctionRegistration.h @@ -1,16 +1,19 @@ /* - * 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/Base/Override.h> +#include <string> + +#include <lua.hpp> + #include <Swiften/Base/API.h> +#include <Swiften/Base/Override.h> + #include <Sluift/Lua/FunctionRegistry.h> -#include <lua.hpp> -#include <string> namespace Swift { namespace Lua { diff --git a/Sluift/Lua/FunctionRegistry.cpp b/Sluift/Lua/FunctionRegistry.cpp index 99a1722..e1fac09 100644 --- a/Sluift/Lua/FunctionRegistry.cpp +++ b/Sluift/Lua/FunctionRegistry.cpp @@ -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. */ @@ -7,8 +7,9 @@ #include <Sluift/Lua/FunctionRegistry.h> #include <Swiften/Base/foreach.h> -#include <Sluift/Lua/LuaUtils.h> + #include <Sluift/Lua/Exception.h> +#include <Sluift/Lua/LuaUtils.h> #include <Sluift/globals.h> using namespace Swift::Lua; diff --git a/Sluift/Lua/FunctionRegistry.h b/Sluift/Lua/FunctionRegistry.h index 800cf05..b6260e0 100644 --- a/Sluift/Lua/FunctionRegistry.h +++ b/Sluift/Lua/FunctionRegistry.h @@ -1,16 +1,18 @@ /* - * 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/Base/Override.h> -#include <lua.hpp> #include <string> #include <vector> +#include <lua.hpp> + +#include <Swiften/Base/Override.h> + namespace Swift { namespace Lua { class FunctionRegistry { diff --git a/Sluift/Lua/LuaUtils.cpp b/Sluift/Lua/LuaUtils.cpp index 78951d8..df1afce 100644 --- a/Sluift/Lua/LuaUtils.cpp +++ b/Sluift/Lua/LuaUtils.cpp @@ -1,20 +1,22 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/Lua/LuaUtils.h> -#include <lua.hpp> - -#include <boost/scope_exit.hpp> -#include <Sluift/Lua/Exception.h> -#include <iostream> #include <cassert> +#include <iostream> #include <sstream> -#include <boost/numeric/conversion/cast.hpp> + #include <boost/algorithm/string/trim.hpp> +#include <boost/numeric/conversion/cast.hpp> +#include <boost/scope_exit.hpp> + +#include <lua.hpp> + +#include <Sluift/Lua/Exception.h> #include <Sluift/globals.h> using namespace Swift::Lua; diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp index 4ce3de8..b5c459a 100644 --- a/Sluift/Lua/Value.cpp +++ b/Sluift/Lua/Value.cpp @@ -1,16 +1,18 @@ /* - * Copyright (c) 2011 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Value.h" +#include <Sluift/Lua/Value.h> + +#include <boost/numeric/conversion/cast.hpp> +#include <boost/variant/apply_visitor.hpp> extern "C" { #include <lualib.h> } -#include <boost/variant/apply_visitor.hpp> -#include <boost/numeric/conversion/cast.hpp> + #include <Swiften/Base/foreach.h> using namespace Swift; diff --git a/Sluift/Lua/Value.h b/Sluift/Lua/Value.h index 9dd870f..537d764 100644 --- a/Sluift/Lua/Value.h +++ b/Sluift/Lua/Value.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,9 +9,10 @@ #include <map> #include <string> #include <vector> -#include <boost/variant.hpp> + #include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <boost/variant.hpp> struct lua_State; diff --git a/Sluift/LuaElementConvertor.h b/Sluift/LuaElementConvertor.h index b463980..9587628 100644 --- a/Sluift/LuaElementConvertor.h +++ b/Sluift/LuaElementConvertor.h @@ -1,16 +1,17 @@ /* - * 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/Base/Override.h> - #include <string> -#include <boost/shared_ptr.hpp> + #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> + +#include <Swiften/Base/Override.h> struct lua_State; diff --git a/Sluift/LuaElementConvertors.h b/Sluift/LuaElementConvertors.h index 49acdf7..1e9dc97 100644 --- a/Sluift/LuaElementConvertors.h +++ b/Sluift/LuaElementConvertors.h @@ -1,16 +1,17 @@ /* - * 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/Base/Override.h> - #include <vector> -#include <boost/shared_ptr.hpp> + #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> + +#include <Swiften/Base/Override.h> struct lua_State; diff --git a/Sluift/Response.cpp b/Sluift/Response.cpp index a785f01..ff643f2 100644 --- a/Sluift/Response.cpp +++ b/Sluift/Response.cpp @@ -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,9 +8,10 @@ #include <lua.hpp> -#include <Sluift/globals.h> #include <Swiften/Elements/ErrorPayload.h> + #include <Sluift/Lua/LuaUtils.h> +#include <Sluift/globals.h> using namespace Swift; using namespace Swift::Sluift; diff --git a/Sluift/Response.h b/Sluift/Response.h index 591e54d..9830dcc 100644 --- a/Sluift/Response.h +++ b/Sluift/Response.h @@ -1,14 +1,14 @@ /* - * 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/Elements/Payload.h> -#include <Swiften/Elements/ErrorPayload.h> #include <Swiften/Base/API.h> +#include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Elements/Payload.h> struct lua_State; diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp index d2b1beb..1de317c 100644 --- a/Sluift/SluiftClient.cpp +++ b/Sluift/SluiftClient.cpp @@ -8,16 +8,17 @@ #include <boost/numeric/conversion/cast.hpp> -#include <Swiften/Client/ClientXMLTracer.h> #include <Swiften/Client/Client.h> -#include <Swiften/Roster/XMPPRoster.h> -#include <Sluift/SluiftGlobals.h> -#include <Sluift/Lua/Exception.h> +#include <Swiften/Client/ClientXMLTracer.h> #include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> #include <Swiften/Elements/PubSubEvent.h> #include <Swiften/Queries/RawRequest.h> +#include <Swiften/Roster/XMPPRoster.h> + #include <Sluift/Helpers.h> -#include <Swiften/Elements/Presence.h> +#include <Sluift/Lua/Exception.h> +#include <Sluift/SluiftGlobals.h> using namespace Swift; diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h index 68c4b61..07073ce 100644 --- a/Sluift/SluiftClient.h +++ b/Sluift/SluiftClient.h @@ -7,23 +7,25 @@ #pragma once #include <deque> -#include <boost/optional.hpp> + #include <boost/bind.hpp> #include <boost/function.hpp> +#include <boost/optional.hpp> +#include <Swiften/Client/Client.h> +#include <Swiften/Client/ClientError.h> #include <Swiften/Client/ClientOptions.h> #include <Swiften/Elements/IQ.h> #include <Swiften/Elements/Message.h> #include <Swiften/Elements/Presence.h> -#include <Swiften/Queries/GenericRequest.h> -#include <Swiften/Roster/XMPPRosterItem.h> -#include <Swiften/Client/ClientError.h> -#include <Swiften/Network/NetworkFactories.h> -#include <Swiften/Client/Client.h> #include <Swiften/EventLoop/SimpleEventLoop.h> -#include <Sluift/Watchdog.h> +#include <Swiften/Network/NetworkFactories.h> #include <Swiften/PubSub/PubSubManager.h> +#include <Swiften/Queries/GenericRequest.h> +#include <Swiften/Roster/XMPPRosterItem.h> + #include <Sluift/Response.h> +#include <Sluift/Watchdog.h> namespace Swift { struct SluiftGlobals; diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp index af3c33b..9d0a92e 100644 --- a/Sluift/SluiftComponent.cpp +++ b/Sluift/SluiftComponent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,15 +8,16 @@ #include <boost/numeric/conversion/cast.hpp> -#include <Swiften/Component/ComponentXMLTracer.h> #include <Swiften/Component/Component.h> -#include <Swiften/Roster/XMPPRoster.h> -#include <Sluift/SluiftGlobals.h> -#include <Sluift/Lua/Exception.h> +#include <Swiften/Component/ComponentXMLTracer.h> #include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> #include <Swiften/Queries/RawRequest.h> +#include <Swiften/Roster/XMPPRoster.h> + #include <Sluift/Helpers.h> -#include <Swiften/Elements/Presence.h> +#include <Sluift/Lua/Exception.h> +#include <Sluift/SluiftGlobals.h> using namespace Swift; diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h index 4e5e763..7a8254c 100644 --- a/Sluift/SluiftComponent.h +++ b/Sluift/SluiftComponent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,22 +7,24 @@ #pragma once #include <deque> -#include <boost/optional.hpp> + #include <boost/bind.hpp> #include <boost/function.hpp> +#include <boost/optional.hpp> #include <Swiften/Client/ClientOptions.h> +#include <Swiften/Component/Component.h> +#include <Swiften/Component/ComponentError.h> #include <Swiften/Elements/IQ.h> #include <Swiften/Elements/Message.h> #include <Swiften/Elements/Presence.h> +#include <Swiften/EventLoop/SimpleEventLoop.h> +#include <Swiften/Network/NetworkFactories.h> #include <Swiften/Queries/GenericRequest.h> #include <Swiften/Roster/XMPPRosterItem.h> -#include <Swiften/Component/ComponentError.h> -#include <Swiften/Network/NetworkFactories.h> -#include <Swiften/Component/Component.h> -#include <Swiften/EventLoop/SimpleEventLoop.h> -#include <Sluift/Watchdog.h> + #include <Sluift/Response.h> +#include <Sluift/Watchdog.h> namespace Swift { struct SluiftGlobals; diff --git a/Sluift/StandardTerminal.cpp b/Sluift/StandardTerminal.cpp index 6e4767d..8dad2b0 100644 --- a/Sluift/StandardTerminal.cpp +++ b/Sluift/StandardTerminal.cpp @@ -1,15 +1,16 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/StandardTerminal.h> -#include <boost/optional.hpp> #include <iostream> #include <stdexcept> +#include <boost/optional.hpp> + using namespace Swift; StandardTerminal::StandardTerminal() { diff --git a/Sluift/StandardTerminal.h b/Sluift/StandardTerminal.h index 6c0eed8..ca71672 100644 --- a/Sluift/StandardTerminal.h +++ b/Sluift/StandardTerminal.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. */ @@ -7,6 +7,7 @@ #pragma once #include <Swiften/Base/Override.h> + #include <Sluift/Terminal.h> namespace Swift { diff --git a/Sluift/Terminal.h b/Sluift/Terminal.h index 60bb060..72ca3d8 100644 --- a/Sluift/Terminal.h +++ b/Sluift/Terminal.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. */ @@ -7,6 +7,7 @@ #pragma once #include <string> + #include <boost/optional/optional_fwd.hpp> namespace Swift { diff --git a/Sluift/client.cpp b/Sluift/client.cpp index 6373a20..3a8b137 100644 --- a/Sluift/client.cpp +++ b/Sluift/client.cpp @@ -4,44 +4,46 @@ * See the COPYING file for more information. */ -#include <boost/lambda/lambda.hpp> -#include <boost/lambda/bind.hpp> -#include <boost/assign/list_of.hpp> #include <iostream> -#include <Sluift/SluiftClient.h> -#include <Swiften/JID/JID.h> -#include <Swiften/Elements/SoftwareVersion.h> +#include <boost/assign/list_of.hpp> +#include <boost/lambda/bind.hpp> +#include <boost/lambda/lambda.hpp> + +#include <Swiften/Base/IDGenerator.h> +#include <Swiften/Base/foreach.h> +#include <Swiften/Disco/ClientDiscoManager.h> +#include <Swiften/Elements/DiscoInfo.h> +#include <Swiften/Elements/MAMQuery.h> #include <Swiften/Elements/Message.h> #include <Swiften/Elements/Presence.h> #include <Swiften/Elements/RawXMLPayload.h> #include <Swiften/Elements/RosterItemPayload.h> #include <Swiften/Elements/RosterPayload.h> -#include <Swiften/Elements/DiscoInfo.h> -#include <Swiften/Elements/MAMQuery.h> -#include <Swiften/Disco/ClientDiscoManager.h> -#include <Swiften/Queries/GenericRequest.h> +#include <Swiften/Elements/SoftwareVersion.h> +#include <Swiften/JID/JID.h> #include <Swiften/Presence/PresenceSender.h> -#include <Swiften/Roster/XMPPRoster.h> -#include <Swiften/Roster/SetRosterRequest.h> #include <Swiften/Presence/SubscriptionManager.h> -#include <Swiften/Roster/XMPPRosterItem.h> +#include <Swiften/Queries/GenericRequest.h> #include <Swiften/Queries/IQRouter.h> #include <Swiften/Queries/Requests/GetSoftwareVersionRequest.h> +#include <Swiften/Roster/SetRosterRequest.h> +#include <Swiften/Roster/XMPPRoster.h> +#include <Swiften/Roster/XMPPRosterItem.h> #include <Swiften/TLS/PKCS12Certificate.h> -#include <Sluift/Lua/FunctionRegistration.h> -#include <Swiften/Base/foreach.h> -#include <Swiften/Base/IDGenerator.h> + +#include <Sluift/ElementConvertors/IQConvertor.h> +#include <Sluift/ElementConvertors/MessageConvertor.h> +#include <Sluift/ElementConvertors/PresenceConvertor.h> +#include <Sluift/ElementConvertors/StanzaConvertor.h> +#include <Sluift/ElementConvertors/StatusShowConvertor.h> #include <Sluift/Lua/Check.h> -#include <Sluift/Lua/Value.h> #include <Sluift/Lua/Exception.h> +#include <Sluift/Lua/FunctionRegistration.h> #include <Sluift/Lua/LuaUtils.h> +#include <Sluift/Lua/Value.h> +#include <Sluift/SluiftClient.h> #include <Sluift/globals.h> -#include <Sluift/ElementConvertors/StanzaConvertor.h> -#include <Sluift/ElementConvertors/IQConvertor.h> -#include <Sluift/ElementConvertors/PresenceConvertor.h> -#include <Sluift/ElementConvertors/MessageConvertor.h> -#include <Sluift/ElementConvertors/StatusShowConvertor.h> using namespace Swift; namespace lambda = boost::lambda; diff --git a/Sluift/component.cpp b/Sluift/component.cpp index a9ac2d9..af0b66e 100644 --- a/Sluift/component.cpp +++ b/Sluift/component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -10,19 +10,6 @@ #include <boost/lambda/bind.hpp> #include <boost/lambda/lambda.hpp> -#include <Sluift/ElementConvertors/IQConvertor.h> -#include <Sluift/ElementConvertors/MessageConvertor.h> -#include <Sluift/ElementConvertors/PresenceConvertor.h> -#include <Sluift/ElementConvertors/StanzaConvertor.h> -#include <Sluift/ElementConvertors/StatusShowConvertor.h> -#include <Sluift/Lua/Check.h> -#include <Sluift/Lua/Exception.h> -#include <Sluift/Lua/FunctionRegistration.h> -#include <Sluift/Lua/LuaUtils.h> -#include <Sluift/Lua/Value.h> -#include <Sluift/SluiftComponent.h> -#include <Sluift/globals.h> - #include <Swiften/Base/IDGenerator.h> #include <Swiften/Base/foreach.h> #include <Swiften/Elements/DiscoInfo.h> @@ -43,6 +30,19 @@ #include <Swiften/Roster/XMPPRoster.h> #include <Swiften/Roster/XMPPRosterItem.h> +#include <Sluift/ElementConvertors/IQConvertor.h> +#include <Sluift/ElementConvertors/MessageConvertor.h> +#include <Sluift/ElementConvertors/PresenceConvertor.h> +#include <Sluift/ElementConvertors/StanzaConvertor.h> +#include <Sluift/ElementConvertors/StatusShowConvertor.h> +#include <Sluift/Lua/Check.h> +#include <Sluift/Lua/Exception.h> +#include <Sluift/Lua/FunctionRegistration.h> +#include <Sluift/Lua/LuaUtils.h> +#include <Sluift/Lua/Value.h> +#include <Sluift/SluiftComponent.h> +#include <Sluift/globals.h> + using namespace Swift; namespace lambda = boost::lambda; diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index 7a40270..9b82602 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -1,43 +1,45 @@ /* - * Copyright (c) 2011-2014 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/sluift.h> -#include <lua.hpp> - #include <string> -#include <boost/bind.hpp> -#include <boost/numeric/conversion/cast.hpp> + #include <boost/assign/list_of.hpp> +#include <boost/bind.hpp> #include <boost/filesystem.hpp> +#include <boost/numeric/conversion/cast.hpp> + +#include <lua.hpp> -#include "Watchdog.h" -#include <Sluift/Lua/Check.h> -#include <Sluift/SluiftClient.h> -#include <Sluift/SluiftComponent.h> -#include <Sluift/globals.h> -#include <Sluift/Lua/Exception.h> -#include <Sluift/Lua/LuaUtils.h> -#include <Sluift/Lua/FunctionRegistration.h> -#include <Swiften/Base/sleep.h> -#include <Swiften/Base/foreach.h> #include <Swiften/Base/IDGenerator.h> +#include <Swiften/Base/foreach.h> +#include <Swiften/Base/sleep.h> +#include <Swiften/Crypto/CryptoProvider.h> +#include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/IDN/IDNConverter.h> #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h> -#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializer.h> -#include <Swiften/TLS/Certificate.h> -#include <Swiften/TLS/CertificateFactory.h> -#include <Sluift/LuaElementConvertor.h> -#include <Sluift/Lua/Debug.h> +#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Swiften/StringCodecs/Base64.h> #include <Swiften/StringCodecs/Hexify.h> -#include <Swiften/IDN/IDNConverter.h> -#include <Swiften/Crypto/CryptoProvider.h> -#include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/TLS/Certificate.h> +#include <Swiften/TLS/CertificateFactory.h> + #include <Sluift/ITunesInterface.h> +#include <Sluift/Lua/Check.h> +#include <Sluift/Lua/Debug.h> +#include <Sluift/Lua/Exception.h> +#include <Sluift/Lua/FunctionRegistration.h> +#include <Sluift/Lua/LuaUtils.h> +#include <Sluift/LuaElementConvertor.h> +#include <Sluift/SluiftClient.h> +#include <Sluift/SluiftComponent.h> +#include <Sluift/Watchdog.h> +#include <Sluift/globals.h> using namespace Swift; diff --git a/Sluift/tokenize.cpp b/Sluift/tokenize.cpp index 55ab744..e0252f7 100644 --- a/Sluift/tokenize.cpp +++ b/Sluift/tokenize.cpp @@ -1,14 +1,15 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/tokenize.h> -#include <boost/tokenizer.hpp> #include <cctype> +#include <boost/tokenizer.hpp> + using namespace Swift; namespace { diff --git a/Sluift/tokenize.h b/Sluift/tokenize.h index 9a65b07..842f1d3 100644 --- a/Sluift/tokenize.h +++ b/Sluift/tokenize.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <vector> #include <string> +#include <vector> namespace Swift { namespace Lua { |