Swiftdiff options
68 files changed, 318 insertions, 463 deletions
diff --git a/Sluift/ElementConvertors/ElementConvertors.ipp b/Sluift/ElementConvertors/ElementConvertors.ipp index 7d25e86..57e24a4 100644 --- a/Sluift/ElementConvertors/ElementConvertors.ipp +++ b/Sluift/ElementConvertors/ElementConvertors.ipp @@ -1,87 +1,87 @@ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include <Sluift/ElementConvertors/PubSubRetractConvertor.h> +#include <Sluift/ElementConvertors/IsodeIQDelegationConvertor.h> +#include <Sluift/ElementConvertors/PubSubAffiliationConvertor.h> #include <Sluift/ElementConvertors/PubSubAffiliationsConvertor.h> -#include <Sluift/ElementConvertors/PubSubPublishConvertor.h> -#include <Sluift/ElementConvertors/PubSubItemsConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventRedirectConvertor.h> -#include <Sluift/ElementConvertors/UserTuneConvertor.h> #include <Sluift/ElementConvertors/PubSubConfigureConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h> -#include <Sluift/ElementConvertors/UserLocationConvertor.h> -#include <Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h> +#include <Sluift/ElementConvertors/PubSubCreateConvertor.h> #include <Sluift/ElementConvertors/PubSubDefaultConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventAssociateConvertor.h> #include <Sluift/ElementConvertors/PubSubEventCollectionConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventRetractConvertor.h> -#include <Sluift/ElementConvertors/PubSubItemConvertor.h> -#include <Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h> #include <Sluift/ElementConvertors/PubSubEventDeleteConvertor.h> -#include <Sluift/ElementConvertors/PubSubCreateConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventItemConvertor.h> #include <Sluift/ElementConvertors/PubSubEventItemsConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventPurgeConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventRedirectConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventRetractConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h> +#include <Sluift/ElementConvertors/PubSubItemConvertor.h> +#include <Sluift/ElementConvertors/PubSubItemsConvertor.h> #include <Sluift/ElementConvertors/PubSubOptionsConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventItemConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h> -#include <Sluift/ElementConvertors/IsodeIQDelegationConvertor.h> #include <Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventPurgeConvertor.h> -#include <Sluift/ElementConvertors/PubSubAffiliationConvertor.h> -#include <Sluift/ElementConvertors/PubSubSubscribeConvertor.h> -#include <Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h> #include <Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h> -#include <Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventAssociateConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h> +#include <Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h> +#include <Sluift/ElementConvertors/PubSubPublishConvertor.h> +#include <Sluift/ElementConvertors/PubSubRetractConvertor.h> +#include <Sluift/ElementConvertors/PubSubSubscribeConvertor.h> +#include <Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h> #include <Sluift/ElementConvertors/PubSubSubscriptionConvertor.h> +#include <Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h> +#include <Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h> #include <Sluift/ElementConvertors/SecurityLabelConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h> +#include <Sluift/ElementConvertors/UserLocationConvertor.h> +#include <Sluift/ElementConvertors/UserTuneConvertor.h> void LuaElementConvertors::registerConvertors() { convertors.push_back(boost::make_shared<PubSubRetractConvertor>(this)); convertors.push_back(boost::make_shared<PubSubAffiliationsConvertor>(this)); convertors.push_back(boost::make_shared<PubSubPublishConvertor>(this)); convertors.push_back(boost::make_shared<PubSubItemsConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubOwnerRedirectConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventRedirectConvertor>(this)); - convertors.push_back(boost::make_shared<UserTuneConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubOwnerRedirectConvertor>()); + convertors.push_back(boost::make_shared<PubSubEventRedirectConvertor>()); + convertors.push_back(boost::make_shared<UserTuneConvertor>()); convertors.push_back(boost::make_shared<PubSubConfigureConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventDisassociateConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubEventDisassociateConvertor>()); convertors.push_back(boost::make_shared<PubSubOwnerAffiliationsConvertor>(this)); convertors.push_back(boost::make_shared<PubSubOwnerConfigureConvertor>(this)); - convertors.push_back(boost::make_shared<UserLocationConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubSubscribeOptionsConvertor>(this)); + convertors.push_back(boost::make_shared<UserLocationConvertor>()); + convertors.push_back(boost::make_shared<PubSubSubscribeOptionsConvertor>()); convertors.push_back(boost::make_shared<PubSubOwnerSubscriptionsConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubDefaultConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubDefaultConvertor>()); convertors.push_back(boost::make_shared<PubSubEventCollectionConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventSubscriptionConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventRetractConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubEventSubscriptionConvertor>()); + convertors.push_back(boost::make_shared<PubSubEventRetractConvertor>()); convertors.push_back(boost::make_shared<PubSubItemConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubUnsubscribeConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubUnsubscribeConvertor>()); convertors.push_back(boost::make_shared<PubSubEventDeleteConvertor>(this)); convertors.push_back(boost::make_shared<PubSubCreateConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubOwnerPurgeConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubOwnerPurgeConvertor>()); convertors.push_back(boost::make_shared<PubSubEventItemsConvertor>(this)); convertors.push_back(boost::make_shared<PubSubOptionsConvertor>(this)); convertors.push_back(boost::make_shared<PubSubEventItemConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubOwnerSubscriptionConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubOwnerSubscriptionConvertor>()); convertors.push_back(boost::make_shared<IsodeIQDelegationConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubOwnerAffiliationConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventPurgeConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubAffiliationConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubOwnerAffiliationConvertor>()); + convertors.push_back(boost::make_shared<PubSubEventPurgeConvertor>()); + convertors.push_back(boost::make_shared<PubSubAffiliationConvertor>()); convertors.push_back(boost::make_shared<PubSubSubscribeConvertor>(this)); convertors.push_back(boost::make_shared<PubSubOwnerDeleteConvertor>(this)); convertors.push_back(boost::make_shared<PubSubOwnerDefaultConvertor>(this)); convertors.push_back(boost::make_shared<PubSubSubscriptionsConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventAssociateConvertor>(this)); + convertors.push_back(boost::make_shared<PubSubEventAssociateConvertor>()); convertors.push_back(boost::make_shared<PubSubSubscriptionConvertor>(this)); - convertors.push_back(boost::make_shared<SecurityLabelConvertor>(this)); + convertors.push_back(boost::make_shared<SecurityLabelConvertor>()); convertors.push_back(boost::make_shared<PubSubEventConfigurationConvertor>(this)); } diff --git a/Sluift/ElementConvertors/ForwardedConvertor.cpp b/Sluift/ElementConvertors/ForwardedConvertor.cpp index a6ec79c..a1f53a3 100644 --- a/Sluift/ElementConvertors/ForwardedConvertor.cpp +++ b/Sluift/ElementConvertors/ForwardedConvertor.cpp @@ -1,21 +1,23 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Sluift/ElementConvertors/ForwardedConvertor.h> + #include <boost/numeric/conversion/cast.hpp> #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> + #include <Swiften/Base/foreach.h> -#include <Sluift/ElementConvertors/ForwardedConvertor.h> -#include <Sluift/LuaElementConvertors.h> #include <Swiften/Elements/Delay.h> #include <Swiften/Elements/IQ.h> -#include <Swiften/Elements/Presence.h> #include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/IQConvertor.cpp b/Sluift/ElementConvertors/IQConvertor.cpp index e9119cb..019ec57 100644 --- a/Sluift/ElementConvertors/IQConvertor.cpp +++ b/Sluift/ElementConvertors/IQConvertor.cpp @@ -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. */ +#include <Sluift/ElementConvertors/IQConvertor.h> + #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/IQConvertor.h> -#include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.cpp b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.cpp index c60a7aa..bb1de94 100644 --- a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.cpp +++ b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/IsodeIQDelegationConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; IsodeIQDelegationConvertor::IsodeIQDelegationConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/MAMFinConvertor.cpp b/Sluift/ElementConvertors/MAMFinConvertor.cpp index 25e4406..977dbc9 100644 --- a/Sluift/ElementConvertors/MAMFinConvertor.cpp +++ b/Sluift/ElementConvertors/MAMFinConvertor.cpp @@ -1,17 +1,19 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Sluift/ElementConvertors/MAMFinConvertor.h> + #include <boost/numeric/conversion/cast.hpp> #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/MAMFinConvertor.h> -#include <Sluift/LuaElementConvertors.h> + #include <Swiften/Elements/ResultSet.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/MAMQueryConvertor.cpp b/Sluift/ElementConvertors/MAMQueryConvertor.cpp index d53fd9b..89a8876 100644 --- a/Sluift/ElementConvertors/MAMQueryConvertor.cpp +++ b/Sluift/ElementConvertors/MAMQueryConvertor.cpp @@ -1,18 +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/MAMQueryConvertor.h> + #include <boost/numeric/conversion/cast.hpp> #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/MAMQueryConvertor.h> -#include <Sluift/LuaElementConvertors.h> + #include <Swiften/Elements/Form.h> #include <Swiften/Elements/ResultSet.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/MAMResultConvertor.cpp b/Sluift/ElementConvertors/MAMResultConvertor.cpp index c163201..02c5976 100644 --- a/Sluift/ElementConvertors/MAMResultConvertor.cpp +++ b/Sluift/ElementConvertors/MAMResultConvertor.cpp @@ -1,18 +1,19 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Sluift/ElementConvertors/MAMResultConvertor.h> + #include <boost/numeric/conversion/cast.hpp> #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/MAMResultConvertor.h> -#include <Sluift/LuaElementConvertors.h> -#include <Swiften/Elements/Forwarded.h> +#include <Swiften/Elements/Forwarded.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/MessageConvertor.cpp b/Sluift/ElementConvertors/MessageConvertor.cpp index d56e680..52b3b90 100644 --- a/Sluift/ElementConvertors/MessageConvertor.cpp +++ b/Sluift/ElementConvertors/MessageConvertor.cpp @@ -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. */ +#include <Sluift/ElementConvertors/MessageConvertor.h> + #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/MessageConvertor.h> -#include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PresenceConvertor.cpp b/Sluift/ElementConvertors/PresenceConvertor.cpp index 4ab178c..edf3941 100644 --- a/Sluift/ElementConvertors/PresenceConvertor.cpp +++ b/Sluift/ElementConvertors/PresenceConvertor.cpp @@ -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. */ +#include <Sluift/ElementConvertors/PresenceConvertor.h> + #include <boost/smart_ptr/make_shared.hpp> + #include <lua.hpp> -#include <Sluift/ElementConvertors/PresenceConvertor.h> -#include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubAffiliationConvertor.cpp b/Sluift/ElementConvertors/PubSubAffiliationConvertor.cpp index c35488d..717d01c 100644 --- a/Sluift/ElementConvertors/PubSubAffiliationConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubAffiliationConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubAffiliationConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubAffiliationConvertor::PubSubAffiliationConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubAffiliation>("pubsub_affiliation"), - convertors(convertors) { +PubSubAffiliationConvertor::PubSubAffiliationConvertor() : + GenericLuaElementConvertor<PubSubAffiliation>("pubsub_affiliation") { } PubSubAffiliationConvertor::~PubSubAffiliationConvertor() { diff --git a/Sluift/ElementConvertors/PubSubAffiliationConvertor.h b/Sluift/ElementConvertors/PubSubAffiliationConvertor.h index 846dc38..7faf9e5 100644 --- a/Sluift/ElementConvertors/PubSubAffiliationConvertor.h +++ b/Sluift/ElementConvertors/PubSubAffiliationConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubAffiliation.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubAffiliation.h> namespace Swift { class LuaElementConvertors; class PubSubAffiliationConvertor : public GenericLuaElementConvertor<PubSubAffiliation> { public: - PubSubAffiliationConvertor(LuaElementConvertors* convertors); + PubSubAffiliationConvertor(); virtual ~PubSubAffiliationConvertor(); virtual boost::shared_ptr<PubSubAffiliation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubAffiliation>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.cpp b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.cpp index a338eda..e0d003c 100644 --- a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubAffiliationsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubConfigureConvertor.cpp b/Sluift/ElementConvertors/PubSubConfigureConvertor.cpp index be6b978..9153d9e 100644 --- a/Sluift/ElementConvertors/PubSubConfigureConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubConfigureConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubConfigureConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubConfigureConvertor::PubSubConfigureConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubCreateConvertor.cpp b/Sluift/ElementConvertors/PubSubCreateConvertor.cpp index ac601d9..af5056f 100644 --- a/Sluift/ElementConvertors/PubSubCreateConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubCreateConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubCreateConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubCreateConvertor::PubSubCreateConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubDefaultConvertor.cpp b/Sluift/ElementConvertors/PubSubDefaultConvertor.cpp index e0de984..43dcbe4 100644 --- a/Sluift/ElementConvertors/PubSubDefaultConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubDefaultConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubDefaultConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubDefaultConvertor::PubSubDefaultConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubDefault>("pubsub_default"), - convertors(convertors) { +PubSubDefaultConvertor::PubSubDefaultConvertor() : + GenericLuaElementConvertor<PubSubDefault>("pubsub_default") { } PubSubDefaultConvertor::~PubSubDefaultConvertor() { diff --git a/Sluift/ElementConvertors/PubSubDefaultConvertor.h b/Sluift/ElementConvertors/PubSubDefaultConvertor.h index 9b6a01f..2eeeaa1 100644 --- a/Sluift/ElementConvertors/PubSubDefaultConvertor.h +++ b/Sluift/ElementConvertors/PubSubDefaultConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubDefault.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubDefault.h> namespace Swift { class LuaElementConvertors; class PubSubDefaultConvertor : public GenericLuaElementConvertor<PubSubDefault> { public: - PubSubDefaultConvertor(LuaElementConvertors* convertors); + PubSubDefaultConvertor(); virtual ~PubSubDefaultConvertor(); virtual boost::shared_ptr<PubSubDefault> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubDefault>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.cpp b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.cpp index 623ddc4..fdfec29 100644 --- a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventAssociateConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubEventAssociateConvertor::PubSubEventAssociateConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventAssociate>("pubsub_event_associate"), - convertors(convertors) { +PubSubEventAssociateConvertor::PubSubEventAssociateConvertor() : + GenericLuaElementConvertor<PubSubEventAssociate>("pubsub_event_associate") { } PubSubEventAssociateConvertor::~PubSubEventAssociateConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h index 6f4f3d8..116947d 100644 --- a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventAssociate.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventAssociate.h> namespace Swift { class LuaElementConvertors; class PubSubEventAssociateConvertor : public GenericLuaElementConvertor<PubSubEventAssociate> { public: - PubSubEventAssociateConvertor(LuaElementConvertors* convertors); + PubSubEventAssociateConvertor(); virtual ~PubSubEventAssociateConvertor(); virtual boost::shared_ptr<PubSubEventAssociate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventAssociate>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.cpp b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.cpp index 8fdfefa..35eeda4 100644 --- a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventCollectionConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubEventCollectionConvertor::PubSubEventCollectionConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.cpp b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.cpp index 56f46ec..72c15ae 100644 --- a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubEventConfigurationConvertor::PubSubEventConfigurationConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubEventConvertor.cpp b/Sluift/ElementConvertors/PubSubEventConvertor.cpp index ae4374c..fa64e7f 100644 --- a/Sluift/ElementConvertors/PubSubEventConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubEventConvertor::PubSubEventConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.cpp b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.cpp index 29ead48..d44d1a6 100644 --- a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventDeleteConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubEventDeleteConvertor::PubSubEventDeleteConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.cpp b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.cpp index 9ca8395..4811cc2 100644 --- a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubEventDisassociateConvertor::PubSubEventDisassociateConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventDisassociate>("pubsub_event_disassociate"), - convertors(convertors) { +PubSubEventDisassociateConvertor::PubSubEventDisassociateConvertor() : + GenericLuaElementConvertor<PubSubEventDisassociate>("pubsub_event_disassociate") { } PubSubEventDisassociateConvertor::~PubSubEventDisassociateConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h index 25a3863..69f2d11 100644 --- a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventDisassociate.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventDisassociate.h> namespace Swift { class LuaElementConvertors; class PubSubEventDisassociateConvertor : public GenericLuaElementConvertor<PubSubEventDisassociate> { public: - PubSubEventDisassociateConvertor(LuaElementConvertors* convertors); + PubSubEventDisassociateConvertor(); virtual ~PubSubEventDisassociateConvertor(); virtual boost::shared_ptr<PubSubEventDisassociate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventDisassociate>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventItemConvertor.cpp b/Sluift/ElementConvertors/PubSubEventItemConvertor.cpp index 43a64ff..7e6131a 100644 --- a/Sluift/ElementConvertors/PubSubEventItemConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventItemConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventItemConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubEventItemsConvertor.cpp b/Sluift/ElementConvertors/PubSubEventItemsConvertor.cpp index 3287a6d..66400e9 100644 --- a/Sluift/ElementConvertors/PubSubEventItemsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventItemsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventItemsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.cpp b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.cpp index e4604c0..bd036c1 100644 --- a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventPurgeConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubEventPurgeConvertor::PubSubEventPurgeConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventPurge>("pubsub_event_purge"), - convertors(convertors) { +PubSubEventPurgeConvertor::PubSubEventPurgeConvertor() : + GenericLuaElementConvertor<PubSubEventPurge>("pubsub_event_purge") { } PubSubEventPurgeConvertor::~PubSubEventPurgeConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h index 39e571d..88af6f4 100644 --- a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventPurge.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventPurge.h> namespace Swift { class LuaElementConvertors; class PubSubEventPurgeConvertor : public GenericLuaElementConvertor<PubSubEventPurge> { public: - PubSubEventPurgeConvertor(LuaElementConvertors* convertors); + PubSubEventPurgeConvertor(); virtual ~PubSubEventPurgeConvertor(); virtual boost::shared_ptr<PubSubEventPurge> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventPurge>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.cpp b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.cpp index 3c0555e..81584e3 100644 --- a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventRedirectConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubEventRedirectConvertor::PubSubEventRedirectConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventRedirect>("pubsub_event_redirect"), - convertors(convertors) { +PubSubEventRedirectConvertor::PubSubEventRedirectConvertor() : + GenericLuaElementConvertor<PubSubEventRedirect>("pubsub_event_redirect") { } PubSubEventRedirectConvertor::~PubSubEventRedirectConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h index 90b9d49..d5724ae 100644 --- a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventRedirect.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventRedirect.h> namespace Swift { class LuaElementConvertors; class PubSubEventRedirectConvertor : public GenericLuaElementConvertor<PubSubEventRedirect> { public: - PubSubEventRedirectConvertor(LuaElementConvertors* convertors); + PubSubEventRedirectConvertor(); virtual ~PubSubEventRedirectConvertor(); virtual boost::shared_ptr<PubSubEventRedirect> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventRedirect>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventRetractConvertor.cpp b/Sluift/ElementConvertors/PubSubEventRetractConvertor.cpp index f4f1cfb..f851306 100644 --- a/Sluift/ElementConvertors/PubSubEventRetractConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventRetractConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubEventRetractConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubEventRetractConvertor::PubSubEventRetractConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventRetract>("pubsub_event_retract"), - convertors(convertors) { +PubSubEventRetractConvertor::PubSubEventRetractConvertor() : + GenericLuaElementConvertor<PubSubEventRetract>("pubsub_event_retract") { } PubSubEventRetractConvertor::~PubSubEventRetractConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventRetractConvertor.h b/Sluift/ElementConvertors/PubSubEventRetractConvertor.h index 0e3b303..72ca0a3 100644 --- a/Sluift/ElementConvertors/PubSubEventRetractConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventRetractConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventRetract.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventRetract.h> namespace Swift { class LuaElementConvertors; class PubSubEventRetractConvertor : public GenericLuaElementConvertor<PubSubEventRetract> { public: - PubSubEventRetractConvertor(LuaElementConvertors* convertors); + PubSubEventRetractConvertor(); virtual ~PubSubEventRetractConvertor(); virtual boost::shared_ptr<PubSubEventRetract> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventRetract>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp index 7eec64d..d83f6be 100644 --- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp @@ -1,24 +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/PubSubEventSubscriptionConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Swiften/Base/DateTime.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; -PubSubEventSubscriptionConvertor::PubSubEventSubscriptionConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubEventSubscription>("pubsub_event_subscription"), - convertors(convertors) { +PubSubEventSubscriptionConvertor::PubSubEventSubscriptionConvertor() : + GenericLuaElementConvertor<PubSubEventSubscription>("pubsub_event_subscription") { } PubSubEventSubscriptionConvertor::~PubSubEventSubscriptionConvertor() { diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h index c254e34..837a03b 100644 --- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h +++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubEventSubscription.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubEventSubscription.h> namespace Swift { class LuaElementConvertors; class PubSubEventSubscriptionConvertor : public GenericLuaElementConvertor<PubSubEventSubscription> { public: - PubSubEventSubscriptionConvertor(LuaElementConvertors* convertors); + PubSubEventSubscriptionConvertor(); virtual ~PubSubEventSubscriptionConvertor(); virtual boost::shared_ptr<PubSubEventSubscription> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubEventSubscription>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubItemConvertor.cpp b/Sluift/ElementConvertors/PubSubItemConvertor.cpp index 61aa17c..60f7946 100644 --- a/Sluift/ElementConvertors/PubSubItemConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubItemConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubItemConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp index 8ce1884..9b99c86 100644 --- a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubItemsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp index dcb37a5..2beaee9 100644 --- a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOptionsConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubOptionsConvertor::PubSubOptionsConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.cpp index bfcd4c4..7e1ec9a 100644 --- a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubOwnerAffiliationConvertor::PubSubOwnerAffiliationConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubOwnerAffiliation>("pubsub_owner_affiliation"), - convertors(convertors) { +PubSubOwnerAffiliationConvertor::PubSubOwnerAffiliationConvertor() : + GenericLuaElementConvertor<PubSubOwnerAffiliation>("pubsub_owner_affiliation") { } PubSubOwnerAffiliationConvertor::~PubSubOwnerAffiliationConvertor() { diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h index f16503f..6876882 100644 --- a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerAffiliation.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerAffiliation.h> namespace Swift { class LuaElementConvertors; class PubSubOwnerAffiliationConvertor : public GenericLuaElementConvertor<PubSubOwnerAffiliation> { public: - PubSubOwnerAffiliationConvertor(LuaElementConvertors* convertors); + PubSubOwnerAffiliationConvertor(); virtual ~PubSubOwnerAffiliationConvertor(); virtual boost::shared_ptr<PubSubOwnerAffiliation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubOwnerAffiliation>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.cpp index 85f9c3f..4827914 100644 --- a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.cpp index 1c8c0fb..2620649 100644 --- a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubOwnerConfigureConvertor::PubSubOwnerConfigureConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.cpp index 9879be2..e493601 100644 --- a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubOwnerDefaultConvertor::PubSubOwnerDefaultConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.cpp index e6e2b4f..2c818f1 100644 --- a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubOwnerDeleteConvertor::PubSubOwnerDeleteConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.cpp index 5b605bd..cf56f6b 100644 --- a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubOwnerPurgeConvertor::PubSubOwnerPurgeConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubOwnerPurge>("pubsub_owner_purge"), - convertors(convertors) { +PubSubOwnerPurgeConvertor::PubSubOwnerPurgeConvertor() : + GenericLuaElementConvertor<PubSubOwnerPurge>("pubsub_owner_purge") { } PubSubOwnerPurgeConvertor::~PubSubOwnerPurgeConvertor() { diff --git a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h index 45bba63..2ef7bd5 100644 --- a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerPurge.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerPurge.h> namespace Swift { class LuaElementConvertors; class PubSubOwnerPurgeConvertor : public GenericLuaElementConvertor<PubSubOwnerPurge> { public: - PubSubOwnerPurgeConvertor(LuaElementConvertors* convertors); + PubSubOwnerPurgeConvertor(); virtual ~PubSubOwnerPurgeConvertor(); virtual boost::shared_ptr<PubSubOwnerPurge> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubOwnerPurge>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.cpp index 4ac5573..a98a213 100644 --- a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubOwnerRedirectConvertor::PubSubOwnerRedirectConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubOwnerRedirect>("pubsub_owner_redirect"), - convertors(convertors) { +PubSubOwnerRedirectConvertor::PubSubOwnerRedirectConvertor() : + GenericLuaElementConvertor<PubSubOwnerRedirect>("pubsub_owner_redirect") { } PubSubOwnerRedirectConvertor::~PubSubOwnerRedirectConvertor() { diff --git a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h index e563f97..8a61ef2 100644 --- a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerRedirect.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerRedirect.h> namespace Swift { class LuaElementConvertors; class PubSubOwnerRedirectConvertor : public GenericLuaElementConvertor<PubSubOwnerRedirect> { public: - PubSubOwnerRedirectConvertor(LuaElementConvertors* convertors); + PubSubOwnerRedirectConvertor(); virtual ~PubSubOwnerRedirectConvertor(); virtual boost::shared_ptr<PubSubOwnerRedirect> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubOwnerRedirect>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp index 844d669..57d4f3d 100644 --- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubOwnerSubscriptionConvertor::PubSubOwnerSubscriptionConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubOwnerSubscription>("pubsub_owner_subscription"), - convertors(convertors) { +PubSubOwnerSubscriptionConvertor::PubSubOwnerSubscriptionConvertor() : + GenericLuaElementConvertor<PubSubOwnerSubscription>("pubsub_owner_subscription") { } PubSubOwnerSubscriptionConvertor::~PubSubOwnerSubscriptionConvertor() { diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h index 6742013..61c1a5e 100644 --- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h +++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubOwnerSubscription.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubOwnerSubscription.h> namespace Swift { class LuaElementConvertors; class PubSubOwnerSubscriptionConvertor : public GenericLuaElementConvertor<PubSubOwnerSubscription> { public: - PubSubOwnerSubscriptionConvertor(LuaElementConvertors* convertors); + PubSubOwnerSubscriptionConvertor(); virtual ~PubSubOwnerSubscriptionConvertor(); virtual boost::shared_ptr<PubSubOwnerSubscription> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubOwnerSubscription>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.cpp index d061b2d..3298096 100644 --- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubPublishConvertor.cpp b/Sluift/ElementConvertors/PubSubPublishConvertor.cpp index 961d210..89a7d8d 100644 --- a/Sluift/ElementConvertors/PubSubPublishConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubPublishConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubPublishConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubRetractConvertor.cpp b/Sluift/ElementConvertors/PubSubRetractConvertor.cpp index abf19df..f6d186e 100644 --- a/Sluift/ElementConvertors/PubSubRetractConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubRetractConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubRetractConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubSubscribeConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscribeConvertor.cpp index 64be818..436b660 100644 --- a/Sluift/ElementConvertors/PubSubSubscribeConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubSubscribeConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubSubscribeConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubSubscribeConvertor::PubSubSubscribeConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.cpp index 8a068ff..3640084 100644 --- a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubSubscribeOptionsConvertor::PubSubSubscribeOptionsConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubSubscribeOptions>("pubsub_subscribe_options"), - convertors(convertors) { +PubSubSubscribeOptionsConvertor::PubSubSubscribeOptionsConvertor() : + GenericLuaElementConvertor<PubSubSubscribeOptions>("pubsub_subscribe_options") { } PubSubSubscribeOptionsConvertor::~PubSubSubscribeOptionsConvertor() { diff --git a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h index a36e7bb..1135300 100644 --- a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h +++ b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubSubscribeOptions.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubSubscribeOptions.h> namespace Swift { class LuaElementConvertors; class PubSubSubscribeOptionsConvertor : public GenericLuaElementConvertor<PubSubSubscribeOptions> { public: - PubSubSubscribeOptionsConvertor(LuaElementConvertors* convertors); + PubSubSubscribeOptionsConvertor(); virtual ~PubSubSubscribeOptionsConvertor(); virtual boost::shared_ptr<PubSubSubscribeOptions> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubSubscribeOptions>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp index 3aad76e..21a7fc8 100644 --- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp @@ -1,19 +1,17 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubSubscriptionConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> +#include <lua.hpp> #include <Sluift/LuaElementConvertors.h> -#pragma clang diagnostic ignored "-Wunused-private-field" - using namespace Swift; PubSubSubscriptionConvertor::PubSubSubscriptionConvertor(LuaElementConvertors* convertors) : diff --git a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.cpp index 5e66f2f..cdaf5c7 100644 --- a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.cpp @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubSubscriptionsConvertor.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/LuaElementConvertors.h> #include <Swiften/Base/foreach.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Sluift/LuaElementConvertors.h> using namespace Swift; diff --git a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp index 4b515ea..f25e9cf 100644 --- a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp +++ b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp @@ -1,24 +1,19 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h> -#include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> - - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -PubSubUnsubscribeConvertor::PubSubUnsubscribeConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<PubSubUnsubscribe>("pubsub_unsubscribe"), - convertors(convertors) { +PubSubUnsubscribeConvertor::PubSubUnsubscribeConvertor() : + GenericLuaElementConvertor<PubSubUnsubscribe>("pubsub_unsubscribe") { } PubSubUnsubscribeConvertor::~PubSubUnsubscribeConvertor() { diff --git a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h index e075298..91c856a 100644 --- a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h +++ b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/PubSubUnsubscribe.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/PubSubUnsubscribe.h> namespace Swift { class LuaElementConvertors; class PubSubUnsubscribeConvertor : public GenericLuaElementConvertor<PubSubUnsubscribe> { public: - PubSubUnsubscribeConvertor(LuaElementConvertors* convertors); + PubSubUnsubscribeConvertor(); virtual ~PubSubUnsubscribeConvertor(); virtual boost::shared_ptr<PubSubUnsubscribe> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<PubSubUnsubscribe>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/ResultSetConvertor.cpp b/Sluift/ElementConvertors/ResultSetConvertor.cpp index 79eb00d..166ddd4 100644 --- a/Sluift/ElementConvertors/ResultSetConvertor.cpp +++ b/Sluift/ElementConvertors/ResultSetConvertor.cpp @@ -1,21 +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/ResultSetConvertor.h> + #include <boost/numeric/conversion/cast.hpp> #include <boost/smart_ptr/make_shared.hpp> -#include <lua.hpp> -#include <Sluift/ElementConvertors/ResultSetConvertor.h> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -ResultSetConvertor::ResultSetConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<ResultSet>("result_set"), - convertors(convertors) { +ResultSetConvertor::ResultSetConvertor() : + GenericLuaElementConvertor<ResultSet>("result_set") { } ResultSetConvertor::~ResultSetConvertor() { diff --git a/Sluift/ElementConvertors/ResultSetConvertor.h b/Sluift/ElementConvertors/ResultSetConvertor.h index 50a6836..46353f2 100644 --- a/Sluift/ElementConvertors/ResultSetConvertor.h +++ b/Sluift/ElementConvertors/ResultSetConvertor.h @@ -1,29 +1,27 @@ /* - * 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/ResultSet.h> +#include <Sluift/GenericLuaElementConvertor.h> + namespace Swift { class LuaElementConvertors; class ResultSetConvertor : public GenericLuaElementConvertor<ResultSet> { public: - ResultSetConvertor(LuaElementConvertors* convertors); + ResultSetConvertor(); virtual ~ResultSetConvertor(); virtual boost::shared_ptr<ResultSet> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<ResultSet>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/SecurityLabelConvertor.cpp b/Sluift/ElementConvertors/SecurityLabelConvertor.cpp index cfaeb7d..011cfda 100644 --- a/Sluift/ElementConvertors/SecurityLabelConvertor.cpp +++ b/Sluift/ElementConvertors/SecurityLabelConvertor.cpp @@ -1,24 +1,22 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/SecurityLabelConvertor.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 <Swiften/Base/foreach.h> +#include <lua.hpp> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Swiften/Base/foreach.h> using namespace Swift; -SecurityLabelConvertor::SecurityLabelConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<SecurityLabel>("security_label"), - convertors(convertors) { +SecurityLabelConvertor::SecurityLabelConvertor() : + GenericLuaElementConvertor<SecurityLabel>("security_label") { } SecurityLabelConvertor::~SecurityLabelConvertor() { diff --git a/Sluift/ElementConvertors/SecurityLabelConvertor.h b/Sluift/ElementConvertors/SecurityLabelConvertor.h index 8e489c0..001123d 100644 --- a/Sluift/ElementConvertors/SecurityLabelConvertor.h +++ b/Sluift/ElementConvertors/SecurityLabelConvertor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/SecurityLabel.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/SecurityLabel.h> namespace Swift { class LuaElementConvertors; class SecurityLabelConvertor : public GenericLuaElementConvertor<SecurityLabel> { public: - SecurityLabelConvertor(LuaElementConvertors* convertors); + SecurityLabelConvertor(); virtual ~SecurityLabelConvertor(); virtual boost::shared_ptr<SecurityLabel> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<SecurityLabel>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/UserLocationConvertor.cpp b/Sluift/ElementConvertors/UserLocationConvertor.cpp index 2d546dd..67c4ec0 100644 --- a/Sluift/ElementConvertors/UserLocationConvertor.cpp +++ b/Sluift/ElementConvertors/UserLocationConvertor.cpp @@ -1,24 +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/ElementConvertors/UserLocationConvertor.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 <Swiften/Base/DateTime.h> +#include <lua.hpp> -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <Swiften/Base/DateTime.h> using namespace Swift; -UserLocationConvertor::UserLocationConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<UserLocation>("user_location"), - convertors(convertors) { +UserLocationConvertor::UserLocationConvertor() : + GenericLuaElementConvertor<UserLocation>("user_location") { } UserLocationConvertor::~UserLocationConvertor() { diff --git a/Sluift/ElementConvertors/UserLocationConvertor.h b/Sluift/ElementConvertors/UserLocationConvertor.h index 7582fed..74c0856 100644 --- a/Sluift/ElementConvertors/UserLocationConvertor.h +++ b/Sluift/ElementConvertors/UserLocationConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/UserLocation.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/UserLocation.h> namespace Swift { class LuaElementConvertors; class UserLocationConvertor : public GenericLuaElementConvertor<UserLocation> { public: - UserLocationConvertor(LuaElementConvertors* convertors); + UserLocationConvertor(); virtual ~UserLocationConvertor(); virtual boost::shared_ptr<UserLocation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<UserLocation>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/ElementConvertors/UserTuneConvertor.cpp b/Sluift/ElementConvertors/UserTuneConvertor.cpp index 0ce09e9..d721a34 100644 --- a/Sluift/ElementConvertors/UserTuneConvertor.cpp +++ b/Sluift/ElementConvertors/UserTuneConvertor.cpp @@ -1,24 +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/UserTuneConvertor.h> -#include <lua.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> - - -#pragma clang diagnostic ignored "-Wunused-private-field" +#include <lua.hpp> using namespace Swift; -UserTuneConvertor::UserTuneConvertor(LuaElementConvertors* convertors) : - GenericLuaElementConvertor<UserTune>("user_tune"), - convertors(convertors) { +UserTuneConvertor::UserTuneConvertor() : + GenericLuaElementConvertor<UserTune>("user_tune") { } UserTuneConvertor::~UserTuneConvertor() { diff --git a/Sluift/ElementConvertors/UserTuneConvertor.h b/Sluift/ElementConvertors/UserTuneConvertor.h index e5d0c36..282b9fc 100644 --- a/Sluift/ElementConvertors/UserTuneConvertor.h +++ b/Sluift/ElementConvertors/UserTuneConvertor.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,23 +7,20 @@ #pragma once #include <Swiften/Base/Override.h> +#include <Swiften/Elements/UserTune.h> #include <Sluift/GenericLuaElementConvertor.h> -#include <Swiften/Elements/UserTune.h> namespace Swift { class LuaElementConvertors; class UserTuneConvertor : public GenericLuaElementConvertor<UserTune> { public: - UserTuneConvertor(LuaElementConvertors* convertors); + UserTuneConvertor(); virtual ~UserTuneConvertor(); virtual boost::shared_ptr<UserTune> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; virtual void doConvertToLua(lua_State*, boost::shared_ptr<UserTune>) SWIFTEN_OVERRIDE; virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE; - - private: - LuaElementConvertors* convertors; }; } diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp index 15bb360..963a618 100644 --- a/Sluift/LuaElementConvertors.cpp +++ b/Sluift/LuaElementConvertors.cpp @@ -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. */ @@ -9,33 +9,34 @@ #include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/foreach.h> -#include <Sluift/LuaElementConvertor.h> -#include <Sluift/ElementConvertors/RawXMLElementConvertor.h> -#include <Sluift/ElementConvertors/PubSubEventConvertor.h> + +#include <Sluift/ElementConvertors/BodyConvertor.h> +#include <Sluift/ElementConvertors/CommandConvertor.h> #include <Sluift/ElementConvertors/DOMElementConvertor.h> #include <Sluift/ElementConvertors/DefaultElementConvertor.h> -#include <Sluift/ElementConvertors/DiscoItemsConvertor.h> +#include <Sluift/ElementConvertors/DelayConvertor.h> #include <Sluift/ElementConvertors/DiscoInfoConvertor.h> +#include <Sluift/ElementConvertors/DiscoItemsConvertor.h> #include <Sluift/ElementConvertors/FormConvertor.h> -#include <Sluift/ElementConvertors/SoftwareVersionConvertor.h> -#include <Sluift/ElementConvertors/VCardUpdateConvertor.h> -#include <Sluift/ElementConvertors/VCardConvertor.h> -#include <Sluift/ElementConvertors/BodyConvertor.h> -#include <Sluift/ElementConvertors/SubjectConvertor.h> -#include <Sluift/ElementConvertors/CommandConvertor.h> -#include <Sluift/ElementConvertors/StatusShowConvertor.h> -#include <Sluift/ElementConvertors/StatusConvertor.h> -#include <Sluift/ElementConvertors/DelayConvertor.h> +#include <Sluift/ElementConvertors/ForwardedConvertor.h> #include <Sluift/ElementConvertors/IQConvertor.h> -#include <Sluift/ElementConvertors/PresenceConvertor.h> +#include <Sluift/ElementConvertors/MAMFinConvertor.h> +#include <Sluift/ElementConvertors/MAMQueryConvertor.h> +#include <Sluift/ElementConvertors/MAMResultConvertor.h> #include <Sluift/ElementConvertors/MessageConvertor.h> +#include <Sluift/ElementConvertors/PresenceConvertor.h> +#include <Sluift/ElementConvertors/PubSubEventConvertor.h> +#include <Sluift/ElementConvertors/RawXMLElementConvertor.h> #include <Sluift/ElementConvertors/ResultSetConvertor.h> -#include <Sluift/ElementConvertors/ForwardedConvertor.h> -#include <Sluift/ElementConvertors/MAMResultConvertor.h> -#include <Sluift/ElementConvertors/MAMQueryConvertor.h> -#include <Sluift/ElementConvertors/MAMFinConvertor.h> -#include <Sluift/Lua/LuaUtils.h> +#include <Sluift/ElementConvertors/SoftwareVersionConvertor.h> +#include <Sluift/ElementConvertors/StatusConvertor.h> +#include <Sluift/ElementConvertors/StatusShowConvertor.h> +#include <Sluift/ElementConvertors/SubjectConvertor.h> +#include <Sluift/ElementConvertors/VCardConvertor.h> +#include <Sluift/ElementConvertors/VCardUpdateConvertor.h> #include <Sluift/Lua/Exception.h> +#include <Sluift/Lua/LuaUtils.h> +#include <Sluift/LuaElementConvertor.h> using namespace Swift; @@ -57,7 +58,7 @@ LuaElementConvertors::LuaElementConvertors() { convertors.push_back(boost::make_shared<IQConvertor>(this)); convertors.push_back(boost::make_shared<PresenceConvertor>(this)); convertors.push_back(boost::make_shared<MessageConvertor>(this)); - convertors.push_back(boost::make_shared<ResultSetConvertor>(this)); + convertors.push_back(boost::make_shared<ResultSetConvertor>()); convertors.push_back(boost::make_shared<ForwardedConvertor>(this)); convertors.push_back(boost::make_shared<MAMResultConvertor>(this)); convertors.push_back(boost::make_shared<MAMQueryConvertor>(this)); |