1 files changed, 37 insertions, 34 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
index e7672ab..3302863 100644
--- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
@@ -1,14 +1,17 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h>
+
+#include <memory>
+
 #include <boost/lexical_cast.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
-#include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h>
 
 using namespace Swift;
 
@@ -18,44 +21,44 @@ ResultSetSerializer::ResultSetSerializer() {
 ResultSetSerializer::~ResultSetSerializer() {
 }
 
-std::string ResultSetSerializer::serializePayload(boost::shared_ptr<ResultSet> payload) const {
-	if (!payload) {
-		return "";
-	}
+std::string ResultSetSerializer::serializePayload(std::shared_ptr<ResultSet> payload) const {
+    if (!payload) {
+        return "";
+    }
 
-	XMLElement element("set", "http://jabber.org/protocol/rsm");
+    XMLElement element("set", "http://jabber.org/protocol/rsm");
 
-	if (payload->getMaxItems()) {
-		element.addNode(boost::make_shared<XMLElement>("max", "", boost::lexical_cast<std::string>(*payload->getMaxItems())));
-	}
+    if (payload->getMaxItems()) {
+        element.addNode(std::make_shared<XMLElement>("max", "", boost::lexical_cast<std::string>(*payload->getMaxItems())));
+    }
 
-	if (payload->getCount()) {
-		element.addNode(boost::make_shared<XMLElement>("count", "", boost::lexical_cast<std::string>(*payload->getCount())));
-	}
+    if (payload->getCount()) {
+        element.addNode(std::make_shared<XMLElement>("count", "", boost::lexical_cast<std::string>(*payload->getCount())));
+    }
 
-	if (payload->getIndex()) {
-		element.addNode(boost::make_shared<XMLElement>("index", "", boost::lexical_cast<std::string>(*payload->getIndex())));
-	}
+    if (payload->getIndex()) {
+        element.addNode(std::make_shared<XMLElement>("index", "", boost::lexical_cast<std::string>(*payload->getIndex())));
+    }
 
-	if (payload->getFirstID()) {
-		boost::shared_ptr<XMLElement> firstElement = boost::make_shared<XMLElement>("first", "", *payload->getFirstID());
-		if (payload->getFirstIDIndex()) {
-			firstElement->setAttribute("index", boost::lexical_cast<std::string>(*payload->getFirstIDIndex()));
-		}
-		element.addNode(firstElement);
-	}
+    if (payload->getFirstID()) {
+        std::shared_ptr<XMLElement> firstElement = std::make_shared<XMLElement>("first", "", *payload->getFirstID());
+        if (payload->getFirstIDIndex()) {
+            firstElement->setAttribute("index", boost::lexical_cast<std::string>(*payload->getFirstIDIndex()));
+        }
+        element.addNode(firstElement);
+    }
 
-	if (payload->getLastID()) {
-		element.addNode(boost::make_shared<XMLElement>("last", "", *payload->getLastID()));
-	}
+    if (payload->getLastID()) {
+        element.addNode(std::make_shared<XMLElement>("last", "", *payload->getLastID()));
+    }
 
-	if (payload->getBefore()) {
-		element.addNode(boost::make_shared<XMLElement>("before", "", *payload->getBefore()));
-	}
+    if (payload->getBefore()) {
+        element.addNode(std::make_shared<XMLElement>("before", "", *payload->getBefore()));
+    }
 
-	if (payload->getAfter()) {
-		element.addNode(boost::make_shared<XMLElement>("after", "", *payload->getAfter()));
-	}
+    if (payload->getAfter()) {
+        element.addNode(std::make_shared<XMLElement>("after", "", *payload->getAfter()));
+    }
 
-	return element.serialize();
+    return element.serialize();
 }