1 files changed, 17 insertions, 17 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp
index 2d5af7a..c82089a 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.cpp
@@ -1,18 +1,16 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * 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/PubSubRetractSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
-#include <boost/smart_ptr/make_shared.hpp>
+
+#include <memory>
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
@@ -23,17 +21,19 @@ PubSubRetractSerializer::PubSubRetractSerializer(PayloadSerializerCollection* se
 PubSubRetractSerializer::~PubSubRetractSerializer() {
 }
 
-std::string PubSubRetractSerializer::serializePayload(boost::shared_ptr<PubSubRetract> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("retract", "http://jabber.org/protocol/pubsub");
-	element.setAttribute("node", payload->getNode());
-	foreach(boost::shared_ptr<PubSubItem> item, payload->getItems()) {
-		element.addNode(boost::make_shared<XMLRawTextNode>(PubSubItemSerializer(serializers).serialize(item)));
-	}
-	element.setAttribute("notify", payload->isNotify() ? "true" : "false");
-	return element.serialize();
+std::string PubSubRetractSerializer::serializePayload(std::shared_ptr<PubSubRetract> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("retract", "http://jabber.org/protocol/pubsub");
+    element.setAttribute("node", payload->getNode());
+    for (const auto& item : payload->getItems()) {
+        element.addNode(std::make_shared<XMLRawTextNode>(PubSubItemSerializer(serializers).serialize(item)));
+    }
+    if (payload->isNotify().is_initialized()) {
+        element.setAttribute("notify", payload->isNotify().get() ? "true" : "false");
+    }
+    return element.serialize();
 }