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
@@ -22,97 +22,97 @@
 #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/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>());
 }
 
 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");
 	}
 	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<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());
 			lua_setfield(L, -2, "_type");
 			Lua::registerTableToString(L, -1);
 		}
 		else {
 			assert(*type == "xml");
 		}
 		return 1;
 	}
 	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;
 	}
 	return 0;
 }
 
 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;
 	}
 	foreach (boost::shared_ptr<LuaElementConvertor> convertor, convertors) {
 		if (boost::optional<std::string> type = convertor->convertToLua(L, payload)) {
 			return *type;
 		}
 	}
 	return LuaElementConvertor::NO_RESULT;
 }