1 files changed, 29 insertions, 29 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp b/Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp
index 2c3dc06..36401a6 100644
--- a/Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp
@@ -1,46 +1,46 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h>
-#include <Swiften/Base/foreach.h>
+
+#include <memory>
+
+#include <Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
-#include <Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h>
 
 namespace Swift {
 
 SecurityLabelsCatalogSerializer::SecurityLabelsCatalogSerializer() : GenericPayloadSerializer<SecurityLabelsCatalog>() {
 }
 
-std::string SecurityLabelsCatalogSerializer::serializePayload(boost::shared_ptr<SecurityLabelsCatalog> catalog)  const {
-	XMLElement element("catalog", "urn:xmpp:sec-label:catalog:2");
-	if (!catalog->getName().empty()) {
-		element.setAttribute("name", catalog->getName());
-	}
-	if (catalog->getTo().isValid()) {
-		element.setAttribute("to", catalog->getTo());
-	}
-	if (!catalog->getDescription().empty()) {
-		element.setAttribute("desc", catalog->getDescription());
-	}
-	foreach (const SecurityLabelsCatalog::Item& item, catalog->getItems()) {
-		boost::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
-		itemElement->setAttribute("selector", item.getSelector());
-		if (item.getIsDefault()) {
-			itemElement->setAttribute("default", "true");
-		}
-		if (item.getLabel()) {
-			std::string serializedLabel = SecurityLabelSerializer().serialize(item.getLabel());
-			itemElement->addNode(boost::make_shared<XMLRawTextNode>(serializedLabel));
-		}
-		element.addNode(itemElement);
-	}
-	return element.serialize();
+std::string SecurityLabelsCatalogSerializer::serializePayload(std::shared_ptr<SecurityLabelsCatalog> catalog)  const {
+    XMLElement element("catalog", "urn:xmpp:sec-label:catalog:2");
+    if (!catalog->getName().empty()) {
+        element.setAttribute("name", catalog->getName());
+    }
+    if (catalog->getTo().isValid()) {
+        element.setAttribute("to", catalog->getTo());
+    }
+    if (!catalog->getDescription().empty()) {
+        element.setAttribute("desc", catalog->getDescription());
+    }
+    for (const auto& item : catalog->getItems()) {
+        std::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
+        itemElement->setAttribute("selector", item.getSelector());
+        if (item.getIsDefault()) {
+            itemElement->setAttribute("default", "true");
+        }
+        if (item.getLabel()) {
+            std::string serializedLabel = SecurityLabelSerializer().serialize(item.getLabel());
+            itemElement->addNode(std::make_shared<XMLRawTextNode>(serializedLabel));
+        }
+        element.addNode(itemElement);
+    }
+    return element.serialize();
 }
 
 }