1 files changed, 27 insertions, 30 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.cpp
index 8a7b881..51b8b46 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.cpp
@@ -1,51 +1,48 @@
 /*
- * 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/PubSubEventSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h>
-#include <Swiften/Serializer/XML/XMLRawTextNode.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h>
+#include <memory>
+
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h>
-#include <Swiften/Base/foreach.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
+#include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
 
-PubSubEventSerializer::PubSubEventSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventSubscriptionSerializer>(serializers));
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventPurgeSerializer>(serializers));
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventCollectionSerializer>(serializers));
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventDeleteSerializer>(serializers));
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventItemsSerializer>(serializers));
-	pubsubSerializers.push_back(boost::make_shared<PubSubEventConfigurationSerializer>(serializers));
+PubSubEventSerializer::PubSubEventSerializer(PayloadSerializerCollection* serializers) {
+    pubsubSerializers.push_back(std::make_shared<PubSubEventSubscriptionSerializer>(serializers));
+    pubsubSerializers.push_back(std::make_shared<PubSubEventPurgeSerializer>(serializers));
+    pubsubSerializers.push_back(std::make_shared<PubSubEventCollectionSerializer>(serializers));
+    pubsubSerializers.push_back(std::make_shared<PubSubEventDeleteSerializer>(serializers));
+    pubsubSerializers.push_back(std::make_shared<PubSubEventItemsSerializer>(serializers));
+    pubsubSerializers.push_back(std::make_shared<PubSubEventConfigurationSerializer>(serializers));
 }
 
 PubSubEventSerializer::~PubSubEventSerializer() {
 }
 
-std::string PubSubEventSerializer::serializePayload(boost::shared_ptr<PubSubEvent> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("event", "http://jabber.org/protocol/pubsub#event");
-	boost::shared_ptr<PubSubEventPayload> p = payload->getPayload();
-	foreach(boost::shared_ptr<PayloadSerializer> serializer, pubsubSerializers) {
-		if (serializer->canSerialize(p)) {
-			element.addNode(boost::make_shared<XMLRawTextNode>(serializer->serialize(p)));
-		}
-	}
-	return element.serialize();
+std::string PubSubEventSerializer::serializePayload(std::shared_ptr<PubSubEvent> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("event", "http://jabber.org/protocol/pubsub#event");
+    std::shared_ptr<PubSubEventPayload> p = payload->getPayload();
+    for (const auto& serializer : pubsubSerializers) {
+        if (serializer->canSerialize(p)) {
+            element.addNode(std::make_shared<XMLRawTextNode>(serializer->serialize(p)));
+        }
+    }
+    return element.serialize();
 }