1 files changed, 80 insertions, 83 deletions
diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
index 7eec64d..cab78d4 100644
--- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
@@ -1,107 +1,104 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h>
 
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
+#include <lua.hpp>
 
 #include <Swiften/Base/DateTime.h>
 
-#pragma clang diagnostic ignored "-Wunused-private-field"
-
 using namespace Swift;
 
-PubSubEventSubscriptionConvertor::PubSubEventSubscriptionConvertor(LuaElementConvertors* convertors) : 
-		GenericLuaElementConvertor<PubSubEventSubscription>("pubsub_event_subscription"),
-		convertors(convertors) {
+PubSubEventSubscriptionConvertor::PubSubEventSubscriptionConvertor() :
+        GenericLuaElementConvertor<PubSubEventSubscription>("pubsub_event_subscription") {
 }
 
 PubSubEventSubscriptionConvertor::~PubSubEventSubscriptionConvertor() {
 }
 
-boost::shared_ptr<PubSubEventSubscription> PubSubEventSubscriptionConvertor::doConvertFromLua(lua_State* L) {
-	boost::shared_ptr<PubSubEventSubscription> result = boost::make_shared<PubSubEventSubscription>();
-	lua_getfield(L, -1, "node");
-	if (lua_isstring(L, -1)) {
-		result->setNode(std::string(lua_tostring(L, -1)));
-	}
-	lua_pop(L, 1);
-	lua_getfield(L, -1, "jid");
-	if (lua_isstring(L, -1)) {
-		result->setJID(JID(std::string(lua_tostring(L, -1))));
-	}
-	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscription");
-	if (lua_isstring(L, -1)) {
-		if (std::string(lua_tostring(L, -1)) == "none") {
-			result->setSubscription(PubSubEventSubscription::None);
-		}
-		if (std::string(lua_tostring(L, -1)) == "pending") {
-			result->setSubscription(PubSubEventSubscription::Pending);
-		}
-		if (std::string(lua_tostring(L, -1)) == "subscribed") {
-			result->setSubscription(PubSubEventSubscription::Subscribed);
-		}
-		if (std::string(lua_tostring(L, -1)) == "unconfigured") {
-			result->setSubscription(PubSubEventSubscription::Unconfigured);
-		}
-	}
-	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscription_id");
-	if (lua_isstring(L, -1)) {
-		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
-	}
-	lua_pop(L, 1);
-	lua_getfield(L, -1, "expiry");
-	if (lua_isstring(L, -1)) {
-		result->setExpiry(stringToDateTime(std::string(lua_tostring(L, -1))));
-	}
-	lua_pop(L, 1);
-	return result;
+std::shared_ptr<PubSubEventSubscription> PubSubEventSubscriptionConvertor::doConvertFromLua(lua_State* L) {
+    std::shared_ptr<PubSubEventSubscription> result = std::make_shared<PubSubEventSubscription>();
+    lua_getfield(L, -1, "node");
+    if (lua_isstring(L, -1)) {
+        result->setNode(std::string(lua_tostring(L, -1)));
+    }
+    lua_pop(L, 1);
+    lua_getfield(L, -1, "jid");
+    if (lua_isstring(L, -1)) {
+        result->setJID(JID(std::string(lua_tostring(L, -1))));
+    }
+    lua_pop(L, 1);
+    lua_getfield(L, -1, "subscription");
+    if (lua_isstring(L, -1)) {
+        if (std::string(lua_tostring(L, -1)) == "none") {
+            result->setSubscription(PubSubEventSubscription::None);
+        }
+        if (std::string(lua_tostring(L, -1)) == "pending") {
+            result->setSubscription(PubSubEventSubscription::Pending);
+        }
+        if (std::string(lua_tostring(L, -1)) == "subscribed") {
+            result->setSubscription(PubSubEventSubscription::Subscribed);
+        }
+        if (std::string(lua_tostring(L, -1)) == "unconfigured") {
+            result->setSubscription(PubSubEventSubscription::Unconfigured);
+        }
+    }
+    lua_pop(L, 1);
+    lua_getfield(L, -1, "subscription_id");
+    if (lua_isstring(L, -1)) {
+        result->setSubscriptionID(std::string(lua_tostring(L, -1)));
+    }
+    lua_pop(L, 1);
+    lua_getfield(L, -1, "expiry");
+    if (lua_isstring(L, -1)) {
+        result->setExpiry(stringToDateTime(std::string(lua_tostring(L, -1))));
+    }
+    lua_pop(L, 1);
+    return result;
 }
 
-void PubSubEventSubscriptionConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubSubEventSubscription> payload) {
-	lua_createtable(L, 0, 0);
-	lua_pushstring(L, payload->getNode().c_str());
-	lua_setfield(L, -2, "node");
-	lua_pushstring(L, payload->getJID().toString().c_str());
-	lua_setfield(L, -2, "jid");
-	switch (payload->getSubscription()) {
-		case PubSubEventSubscription::None:
-			lua_pushstring(L, "none");
-			break;
-		case PubSubEventSubscription::Pending:
-			lua_pushstring(L, "pending");
-			break;
-		case PubSubEventSubscription::Subscribed:
-			lua_pushstring(L, "subscribed");
-			break;
-		case PubSubEventSubscription::Unconfigured:
-			lua_pushstring(L, "unconfigured");
-			break;
-	}
-	lua_setfield(L, -2, "subscription");
-	if (payload->getSubscriptionID()) {
-		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscription_id");
-	}
-	lua_pushstring(L, dateTimeToString(payload->getExpiry()).c_str());
-	lua_setfield(L, -2, "expiry");
+void PubSubEventSubscriptionConvertor::doConvertToLua(lua_State* L, std::shared_ptr<PubSubEventSubscription> payload) {
+    lua_createtable(L, 0, 0);
+    lua_pushstring(L, payload->getNode().c_str());
+    lua_setfield(L, -2, "node");
+    lua_pushstring(L, payload->getJID().toString().c_str());
+    lua_setfield(L, -2, "jid");
+    switch (payload->getSubscription()) {
+        case PubSubEventSubscription::None:
+            lua_pushstring(L, "none");
+            break;
+        case PubSubEventSubscription::Pending:
+            lua_pushstring(L, "pending");
+            break;
+        case PubSubEventSubscription::Subscribed:
+            lua_pushstring(L, "subscribed");
+            break;
+        case PubSubEventSubscription::Unconfigured:
+            lua_pushstring(L, "unconfigured");
+            break;
+    }
+    lua_setfield(L, -2, "subscription");
+    if (payload->getSubscriptionID()) {
+        lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
+        lua_setfield(L, -2, "subscription_id");
+    }
+    lua_pushstring(L, dateTimeToString(payload->getExpiry()).c_str());
+    lua_setfield(L, -2, "expiry");
 }
 
 boost::optional<LuaElementConvertor::Documentation> PubSubEventSubscriptionConvertor::getDocumentation() const {
-	return Documentation(
-		"PubSubEventSubscription",
-		"This table has the following fields:\n\n"
-		"- `node`: string\n"
-		"- `jid`: jid (string)\n"
-		"- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
-		"- `subscription_id`: string (Optional)\n"
-		"- `expiry`: datetime (string)\n"
-	);
+    return Documentation(
+        "PubSubEventSubscription",
+        "This table has the following fields:\n\n"
+        "- `node`: string\n"
+        "- `jid`: jid (string)\n"
+        "- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
+        "- `subscription_id`: string (Optional)\n"
+        "- `expiry`: datetime (string)\n"
+    );
 }