1 files changed, 13 insertions, 16 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
index 7a55228..39550c2 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
@@ -1,33 +1,30 @@
 /*
- * 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.
  */
 
-#pragma clang diagnostic ignored "-Wunused-private-field"
-
 #include <Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+#include <memory>
+
+#include <Swiften/Serializer/XML/XMLElement.h>
 
 using namespace Swift;
 
-PubSubSubscribeOptionsSerializer::PubSubSubscribeOptionsSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
+PubSubSubscribeOptionsSerializer::PubSubSubscribeOptionsSerializer(PayloadSerializerCollection* /*serializers*/) {
 }
 
 PubSubSubscribeOptionsSerializer::~PubSubSubscribeOptionsSerializer() {
 }
 
-std::string PubSubSubscribeOptionsSerializer::serializePayload(boost::shared_ptr<PubSubSubscribeOptions> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("subscribe-options", "http://jabber.org/protocol/pubsub");
-	element.addNode(payload->isRequired() ? boost::make_shared<XMLElement>("required", "") : boost::shared_ptr<XMLElement>());
-	return element.serialize();
+std::string PubSubSubscribeOptionsSerializer::serializePayload(std::shared_ptr<PubSubSubscribeOptions> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("subscribe-options", "http://jabber.org/protocol/pubsub");
+    element.addNode(payload->isRequired() ? std::make_shared<XMLElement>("required", "") : std::shared_ptr<XMLElement>());
+    return element.serialize();
 }