1 files changed, 49 insertions, 47 deletions
diff --git a/Sluift/ElementConvertors/ForwardedConvertor.cpp b/Sluift/ElementConvertors/ForwardedConvertor.cpp
index a6ec79c..b353eea 100644
--- a/Sluift/ElementConvertors/ForwardedConvertor.cpp
+++ b/Sluift/ElementConvertors/ForwardedConvertor.cpp
@@ -1,72 +1,74 @@
 /*
- * 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 <memory>
+
 #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;
 
-ForwardedConvertor::ForwardedConvertor(LuaElementConvertors* convertors) : 
-		GenericLuaElementConvertor<Forwarded>("forwarded"),
-		convertors(convertors) {
+ForwardedConvertor::ForwardedConvertor(LuaElementConvertors* convertors) :
+        GenericLuaElementConvertor<Forwarded>("forwarded"),
+        convertors(convertors) {
 }
 
 ForwardedConvertor::~ForwardedConvertor() {
 }
 
-boost::shared_ptr<Forwarded> ForwardedConvertor::doConvertFromLua(lua_State* L) {
-	boost::shared_ptr<Forwarded> result = boost::make_shared<Forwarded>();
-	lua_getfield(L, -1, "delay");
-	if (!lua_isnil(L, -1)) {
-		boost::shared_ptr<Delay> delay = boost::dynamic_pointer_cast<Delay>(convertors->convertFromLuaUntyped(L, -1, "delay"));
-		if (!!delay) {
-			result->setDelay(delay);
-		}
-	}
-	lua_pop(L, 1);
-	lua_getfield(L, -1, "stanza");
-	if (!lua_isnil(L, -1)) {
-		boost::shared_ptr<Stanza> stanza = boost::dynamic_pointer_cast<Stanza>(convertors->convertFromLua(L, -1));
-		if (!!stanza) {
-			result->setStanza(stanza);
-		}
-		lua_pop(L, 1);
-		return result;
-	}
-	return result;
+std::shared_ptr<Forwarded> ForwardedConvertor::doConvertFromLua(lua_State* L) {
+    std::shared_ptr<Forwarded> result = std::make_shared<Forwarded>();
+    lua_getfield(L, -1, "delay");
+    if (!lua_isnil(L, -1)) {
+        std::shared_ptr<Delay> delay = std::dynamic_pointer_cast<Delay>(convertors->convertFromLuaUntyped(L, -1, "delay"));
+        if (!!delay) {
+            result->setDelay(delay);
+        }
+    }
+    lua_pop(L, 1);
+    lua_getfield(L, -1, "stanza");
+    if (!lua_isnil(L, -1)) {
+        std::shared_ptr<Stanza> stanza = std::dynamic_pointer_cast<Stanza>(convertors->convertFromLua(L, -1));
+        if (!!stanza) {
+            result->setStanza(stanza);
+        }
+        lua_pop(L, 1);
+        return result;
+    }
+    return result;
 }
 
-void ForwardedConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<Forwarded> payload) {
-	lua_createtable(L, 0, 0);
-	if (convertors->convertToLuaUntyped(L, payload->getDelay()) > 0) {
-		lua_setfield(L, -2, "delay");
-	}
-	boost::shared_ptr<Stanza> stanza = payload->getStanza();
-	if (!!stanza) {
-		if (convertors->convertToLua(L, stanza) > 0) {
-			lua_setfield(L, -2, "stanza");
-		}
-	}
+void ForwardedConvertor::doConvertToLua(lua_State* L, std::shared_ptr<Forwarded> payload) {
+    lua_createtable(L, 0, 0);
+    if (convertors->convertToLuaUntyped(L, payload->getDelay()) > 0) {
+        lua_setfield(L, -2, "delay");
+    }
+    std::shared_ptr<Stanza> stanza = payload->getStanza();
+    if (!!stanza) {
+        if (convertors->convertToLua(L, stanza) > 0) {
+            lua_setfield(L, -2, "stanza");
+        }
+    }
 }
 
 boost::optional<LuaElementConvertor::Documentation> ForwardedConvertor::getDocumentation() const {
-	return Documentation(
-		"Forwarded",
-		"This table has the following fields:\n\n"
-		"- `delay`: @{Delay} (Optional)\n"
-		"- `stanza`: @{Stanza} (Optional)\n"
-	);
+    return Documentation(
+        "Forwarded",
+        "This table has the following fields:\n\n"
+        "- `delay`: @{Delay} (Optional)\n"
+        "- `stanza`: @{Stanza} (Optional)\n"
+    );
 }