1 files changed, 58 insertions, 40 deletions
diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp
index 0216874..e0b3687 100644
--- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.cpp
@@ -1,58 +1,76 @@
 /*
- * Copyright (c) 2013 Remko Tronçon
- * Licensed under the GNU General Public License.
+ * Copyright (c) 2013-2016 Isode Limited.
+ * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h>
 
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
-
-
+#include <memory>
 
-#pragma clang diagnostic ignored "-Wunused-private-field"
+#include <lua.hpp>
 
 using namespace Swift;
 
-PubSubOwnerSubscriptionConvertor::PubSubOwnerSubscriptionConvertor(LuaElementConvertors* convertors) : 
-		GenericLuaElementConvertor<PubSubOwnerSubscription>("pubsub_owner_subscription"),
-		convertors(convertors) {
+PubSubOwnerSubscriptionConvertor::PubSubOwnerSubscriptionConvertor() :
+        GenericLuaElementConvertor<PubSubOwnerSubscription>("pubsub_owner_subscription") {
 }
 
 PubSubOwnerSubscriptionConvertor::~PubSubOwnerSubscriptionConvertor() {
 }
 
-boost::shared_ptr<PubSubOwnerSubscription> PubSubOwnerSubscriptionConvertor::doConvertFromLua(lua_State* L) {
-	boost::shared_ptr<PubSubOwnerSubscription> result = boost::make_shared<PubSubOwnerSubscription>();
-	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");
-	lua_pop(L, 1);
-	return result;
+std::shared_ptr<PubSubOwnerSubscription> PubSubOwnerSubscriptionConvertor::doConvertFromLua(lua_State* L) {
+    std::shared_ptr<PubSubOwnerSubscription> result = std::make_shared<PubSubOwnerSubscription>();
+    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(PubSubOwnerSubscription::None);
+        }
+        if (std::string(lua_tostring(L, -1)) == "pending") {
+            result->setSubscription(PubSubOwnerSubscription::Pending);
+        }
+        if (std::string(lua_tostring(L, -1)) == "subscribed") {
+            result->setSubscription(PubSubOwnerSubscription::Subscribed);
+        }
+        if (std::string(lua_tostring(L, -1)) == "unconfigured") {
+            result->setSubscription(PubSubOwnerSubscription::Unconfigured);
+        }
+    }
+    lua_pop(L, 1);
+    return result;
+}
+
+void PubSubOwnerSubscriptionConvertor::doConvertToLua(lua_State* L, std::shared_ptr<PubSubOwnerSubscription> payload) {
+    lua_createtable(L, 0, 0);
+    lua_pushstring(L, payload->getJID().toString().c_str());
+    lua_setfield(L, -2, "jid");
+    switch (payload->getSubscription()) {
+        case PubSubOwnerSubscription::None:
+            lua_pushstring(L, "none");
+            break;
+        case PubSubOwnerSubscription::Pending:
+            lua_pushstring(L, "pending");
+            break;
+        case PubSubOwnerSubscription::Subscribed:
+            lua_pushstring(L, "subscribed");
+            break;
+        case PubSubOwnerSubscription::Unconfigured:
+            lua_pushstring(L, "unconfigured");
+            break;
+    }
+    lua_setfield(L, -2, "subscription");
 }
 
-void PubSubOwnerSubscriptionConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubSubOwnerSubscription> payload) {
-	lua_createtable(L, 0, 0);
-	lua_pushstring(L, payload->getJID().toString().c_str());
-	lua_setfield(L, -2, "jid");
-	switch (payload->getSubscription()) {
-		case PubSubOwnerSubscription::None:
-			lua_pushstring(L, "none");
-			break;
-		case PubSubOwnerSubscription::Pending:
-			lua_pushstring(L, "pending");
-			break;
-		case PubSubOwnerSubscription::Subscribed:
-			lua_pushstring(L, "subscribed");
-			break;
-		case PubSubOwnerSubscription::Unconfigured:
-			lua_pushstring(L, "unconfigured");
-			break;
-	}
-	lua_setfield(L, -2, "subscription");
+boost::optional<LuaElementConvertor::Documentation> PubSubOwnerSubscriptionConvertor::getDocumentation() const {
+    return Documentation(
+        "PubSubOwnerSubscription",
+        "This table has the following fields:\n\n"
+        "- `jid`: jid (string)\n"
+        "- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
+    );
 }