Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-08 12:00:15 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-09 10:28:01 (GMT) |
| commit | afa4aa4a38991fc219d71604baab4d64a2082629 (patch) | |
| tree | eaa97acd2e0dd0913bfaca2c06d8a732c9905f7b /Sluift/LuaElementConvertors.cpp | |
| parent | 6db4b8979b4a7ca72305266a464c571fb648358b (diff) | |
| download | swift-contrib-afa4aa4a38991fc219d71604baab4d64a2082629.zip swift-contrib-afa4aa4a38991fc219d71604baab4d64a2082629.tar.bz2 | |
Fix MAM Sluift.
Change-Id: I75e87e9c1a0f12f6c56dcb63f0a06f715277b99b
Diffstat (limited to 'Sluift/LuaElementConvertors.cpp')
| -rw-r--r-- | Sluift/LuaElementConvertors.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp index a5d0b0a..9ca932e 100644 --- a/Sluift/LuaElementConvertors.cpp +++ b/Sluift/LuaElementConvertors.cpp @@ -20,81 +20,81 @@ #include <Sluift/ElementConvertors/SoftwareVersionConvertor.h> #include <Sluift/ElementConvertors/VCardUpdateConvertor.h> #include <Sluift/ElementConvertors/VCardConvertor.h> #include <Sluift/ElementConvertors/BodyConvertor.h> #include <Sluift/ElementConvertors/CommandConvertor.h> #include <Sluift/ElementConvertors/StatusShowConvertor.h> #include <Sluift/ElementConvertors/StatusConvertor.h> #include <Sluift/ElementConvertors/DelayConvertor.h> #include <Sluift/ElementConvertors/IQConvertor.h> #include <Sluift/ElementConvertors/PresenceConvertor.h> #include <Sluift/ElementConvertors/MessageConvertor.h> #include <Sluift/ElementConvertors/ResultSetConvertor.h> #include <Sluift/ElementConvertors/ForwardedConvertor.h> #include <Sluift/ElementConvertors/MAMResultConvertor.h> #include <Sluift/ElementConvertors/MAMQueryConvertor.h> #include <Sluift/ElementConvertors/MAMArchivedConvertor.h> #include <Sluift/Lua/LuaUtils.h> #include <Sluift/Lua/Exception.h> 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<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<DOMElementConvertor>()); - convertors.push_back(boost::make_shared<RawXMLElementConvertor>()); - convertors.push_back(boost::make_shared<DefaultElementConvertor>()); 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<ForwardedConvertor>(this)); convertors.push_back(boost::make_shared<MAMResultConvertor>(this)); convertors.push_back(boost::make_shared<MAMQueryConvertor>(this)); convertors.push_back(boost::make_shared<MAMArchivedConvertor>(this)); + convertors.push_back(boost::make_shared<DOMElementConvertor>()); + convertors.push_back(boost::make_shared<RawXMLElementConvertor>()); + convertors.push_back(boost::make_shared<DefaultElementConvertor>()); } LuaElementConvertors::~LuaElementConvertors() { } #include <Sluift/ElementConvertors/ElementConvertors.ipp> boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { if (lua_isstring(L, index)) { return convertFromLuaUntyped(L, index, "xml"); } else if (lua_istable(L, index)) { lua_getfield(L, index, "_type"); if (lua_isstring(L, -1)) { std::string type = lua_tostring(L, -1); lua_pop(L, 1); return convertFromLuaUntyped(L, index, type); } lua_pop(L, 1); } throw Lua::Exception("Unable to determine 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<Element> result = convertor->convertFromLua(L, index, type)) { return result; } } return boost::shared_ptr<Element>(); } int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Element> payload) { |