Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Sluift/LuaElementConvertors.cpp | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 | |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Sluift/LuaElementConvertors.cpp')
| -rw-r--r-- | Sluift/LuaElementConvertors.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp index 67c0545..cfc90d8 100644 --- a/Sluift/LuaElementConvertors.cpp +++ b/Sluift/LuaElementConvertors.cpp @@ -6,7 +6,7 @@ #include <Sluift/LuaElementConvertors.h> -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> #include <Swiften/Base/foreach.h> @@ -42,30 +42,30 @@ using namespace Swift; LuaElementConvertors::LuaElementConvertors() { registerConvertors(); - convertors.push_back(boost::make_shared<StatusConvertor>()); - convertors.push_back(boost::make_shared<StatusShowConvertor>()); - convertors.push_back(boost::make_shared<DelayConvertor>()); - convertors.push_back(boost::make_shared<CommandConvertor>(this)); - convertors.push_back(boost::make_shared<PubSubEventConvertor>(this)); - convertors.push_back(boost::make_shared<BodyConvertor>()); - convertors.push_back(boost::make_shared<SubjectConvertor>()); - convertors.push_back(boost::make_shared<VCardConvertor>()); - convertors.push_back(boost::make_shared<VCardUpdateConvertor>()); - convertors.push_back(boost::make_shared<FormConvertor>()); - convertors.push_back(boost::make_shared<SoftwareVersionConvertor>()); - convertors.push_back(boost::make_shared<DiscoInfoConvertor>()); - convertors.push_back(boost::make_shared<DiscoItemsConvertor>()); - 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>()); - convertors.push_back(boost::make_shared<ForwardedConvertor>(this)); - convertors.push_back(boost::make_shared<MAMResultConvertor>(this)); - convertors.push_back(boost::make_shared<MAMQueryConvertor>(this)); - convertors.push_back(boost::make_shared<MAMFinConvertor>(this)); - convertors.push_back(boost::make_shared<DOMElementConvertor>()); - convertors.push_back(boost::make_shared<RawXMLElementConvertor>()); - convertors.push_back(boost::make_shared<DefaultElementConvertor>()); + convertors.push_back(std::make_shared<StatusConvertor>()); + convertors.push_back(std::make_shared<StatusShowConvertor>()); + convertors.push_back(std::make_shared<DelayConvertor>()); + convertors.push_back(std::make_shared<CommandConvertor>(this)); + convertors.push_back(std::make_shared<PubSubEventConvertor>(this)); + convertors.push_back(std::make_shared<BodyConvertor>()); + convertors.push_back(std::make_shared<SubjectConvertor>()); + convertors.push_back(std::make_shared<VCardConvertor>()); + convertors.push_back(std::make_shared<VCardUpdateConvertor>()); + convertors.push_back(std::make_shared<FormConvertor>()); + convertors.push_back(std::make_shared<SoftwareVersionConvertor>()); + convertors.push_back(std::make_shared<DiscoInfoConvertor>()); + convertors.push_back(std::make_shared<DiscoItemsConvertor>()); + convertors.push_back(std::make_shared<IQConvertor>(this)); + convertors.push_back(std::make_shared<PresenceConvertor>(this)); + convertors.push_back(std::make_shared<MessageConvertor>(this)); + convertors.push_back(std::make_shared<ResultSetConvertor>()); + convertors.push_back(std::make_shared<ForwardedConvertor>(this)); + convertors.push_back(std::make_shared<MAMResultConvertor>(this)); + convertors.push_back(std::make_shared<MAMQueryConvertor>(this)); + convertors.push_back(std::make_shared<MAMFinConvertor>(this)); + convertors.push_back(std::make_shared<DOMElementConvertor>()); + convertors.push_back(std::make_shared<RawXMLElementConvertor>()); + convertors.push_back(std::make_shared<DefaultElementConvertor>()); } LuaElementConvertors::~LuaElementConvertors() { @@ -73,7 +73,7 @@ LuaElementConvertors::~LuaElementConvertors() { #include <Sluift/ElementConvertors/ElementConvertors.ipp> -boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { +std::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { if (lua_isstring(L, index)) { return convertFromLuaUntyped(L, index, "xml"); } @@ -89,18 +89,18 @@ boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, in throw Lua::Exception("Unable to determine type"); } -boost::shared_ptr<Element> LuaElementConvertors::convertFromLuaUntyped(lua_State* L, int index, const std::string& type) { +std::shared_ptr<Element> LuaElementConvertors::convertFromLuaUntyped(lua_State* L, int index, const std::string& type) { index = Lua::absoluteOffset(L, index); - foreach (boost::shared_ptr<LuaElementConvertor> convertor, convertors) { - if (boost::shared_ptr<Element> result = convertor->convertFromLua(L, index, type)) { + foreach (std::shared_ptr<LuaElementConvertor> convertor, convertors) { + if (std::shared_ptr<Element> result = convertor->convertFromLua(L, index, type)) { return result; } } - return boost::shared_ptr<Element>(); + return std::shared_ptr<Element>(); } -int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Element> payload) { +int LuaElementConvertors::convertToLua(lua_State* L, std::shared_ptr<Element> payload) { if (boost::optional<std::string> type = doConvertToLuaUntyped(L, payload)) { if (lua_istable(L, -1)) { lua_pushstring(L, type->c_str()); @@ -115,7 +115,7 @@ int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Element> return 0; } -int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<Element> payload) { +int LuaElementConvertors::convertToLuaUntyped(lua_State* L, std::shared_ptr<Element> payload) { if (doConvertToLuaUntyped(L, payload)) { return 1; } @@ -123,11 +123,11 @@ int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<El } boost::optional<std::string> LuaElementConvertors::doConvertToLuaUntyped( - lua_State* L, boost::shared_ptr<Element> payload) { + lua_State* L, std::shared_ptr<Element> payload) { if (!payload) { return LuaElementConvertor::NO_RESULT; } - foreach (boost::shared_ptr<LuaElementConvertor> convertor, convertors) { + foreach (std::shared_ptr<LuaElementConvertor> convertor, convertors) { if (boost::optional<std::string> type = convertor->convertToLua(L, payload)) { return *type; } |