Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-29 08:57:17 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-30 12:35:31 (GMT) |
| commit | 481f33cdee8a907c98f1b87dd1b65418b096c4f6 (patch) | |
| tree | 7a53d23cc300f2aeecd5e3ea73b86bc09f318bce /Sluift/LuaElementConvertors.cpp | |
| parent | c4b64106e7b9493c7b28cc653797457d5f7fbdda (diff) | |
| download | swift-481f33cdee8a907c98f1b87dd1b65418b096c4f6.zip swift-481f33cdee8a907c98f1b87dd1b65418b096c4f6.tar.bz2 | |
Update LuaElementConvertor interface to work with Element instead of Payload.
Change-Id: I4f8b69b1a13fff21c605011f45763e01f03259cf
Diffstat (limited to 'Sluift/LuaElementConvertors.cpp')
| -rw-r--r-- | Sluift/LuaElementConvertors.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp index ba86c06..a79b578 100644 --- a/Sluift/LuaElementConvertors.cpp +++ b/Sluift/LuaElementConvertors.cpp @@ -54,7 +54,7 @@ LuaElementConvertors::~LuaElementConvertors() { #include <Sluift/ElementConvertors/ElementConvertors.ipp> -boost::shared_ptr<Payload> LuaElementConvertors::convertFromLua(lua_State* L, int index) { +boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { if (lua_isstring(L, index)) { return convertFromLuaUntyped(L, index, "xml"); } @@ -70,18 +70,18 @@ boost::shared_ptr<Payload> LuaElementConvertors::convertFromLua(lua_State* L, in throw Lua::Exception("Unable to determine type"); } -boost::shared_ptr<Payload> LuaElementConvertors::convertFromLuaUntyped(lua_State* L, int index, const std::string& type) { +boost::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<Payload> result = convertor->convertFromLua(L, index, type)) { + if (boost::shared_ptr<Element> result = convertor->convertFromLua(L, index, type)) { return result; } } - return boost::shared_ptr<Payload>(); + return boost::shared_ptr<Element>(); } -int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Payload> payload) { +int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Element> payload) { if (boost::optional<std::string> type = doConvertToLuaUntyped(L, payload)) { if (lua_istable(L, -1)) { lua_pushstring(L, type->c_str()); @@ -96,7 +96,7 @@ int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Payload> return 0; } -int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<Payload> payload) { +int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<Element> payload) { if (doConvertToLuaUntyped(L, payload)) { return 1; } @@ -104,7 +104,7 @@ int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<Pa } boost::optional<std::string> LuaElementConvertors::doConvertToLuaUntyped( - lua_State* L, boost::shared_ptr<Payload> payload) { + lua_State* L, boost::shared_ptr<Element> payload) { if (!payload) { return LuaElementConvertor::NO_RESULT; } |