1 files changed, 21 insertions, 22 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.cpp
index 7909cb2..78bb0eb 100644
--- a/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.cpp
@@ -1,41 +1,40 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
 #include <boost/lexical_cast.hpp>
 
-#include <Swiften/Base/foreach.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
-
+#include <Swiften/Serializer/XML/XMLElement.h>
 
 namespace Swift {
 
 BytestreamsSerializer::BytestreamsSerializer() {
 }
 
-std::string BytestreamsSerializer::serializePayload(boost::shared_ptr<Bytestreams> bytestreams)	const {
-	XMLElement queryElement("query", "http://jabber.org/protocol/bytestreams");
-	queryElement.setAttribute("sid", bytestreams->getStreamID());
-	foreach(const Bytestreams::StreamHost& streamHost, bytestreams->getStreamHosts()) {
-		boost::shared_ptr<XMLElement> streamHostElement(new XMLElement("streamhost"));
-		streamHostElement->setAttribute("host", streamHost.host);
-		streamHostElement->setAttribute("jid", streamHost.jid.toString());
-		streamHostElement->setAttribute("port", boost::lexical_cast<std::string>(streamHost.port));
-		queryElement.addNode(streamHostElement);
-	}
-
-	if (bytestreams->getUsedStreamHost()) {
-		boost::shared_ptr<XMLElement> streamHostElement(new XMLElement("streamhost-used"));
-		streamHostElement->setAttribute("jid", *bytestreams->getUsedStreamHost());
-		queryElement.addNode(streamHostElement);
-	}
-	return queryElement.serialize();
+std::string BytestreamsSerializer::serializePayload(std::shared_ptr<Bytestreams> bytestreams)    const {
+    XMLElement queryElement("query", "http://jabber.org/protocol/bytestreams");
+    queryElement.setAttribute("sid", bytestreams->getStreamID());
+    for (const auto& streamHost : bytestreams->getStreamHosts()) {
+        std::shared_ptr<XMLElement> streamHostElement(new XMLElement("streamhost"));
+        streamHostElement->setAttribute("host", streamHost.host);
+        streamHostElement->setAttribute("jid", streamHost.jid.toString());
+        streamHostElement->setAttribute("port", boost::lexical_cast<std::string>(streamHost.port));
+        queryElement.addNode(streamHostElement);
+    }
+
+    if (bytestreams->getUsedStreamHost()) {
+        std::shared_ptr<XMLElement> streamHostElement(new XMLElement("streamhost-used"));
+        streamHostElement->setAttribute("jid", *bytestreams->getUsedStreamHost());
+        queryElement.addNode(streamHostElement);
+    }
+    return queryElement.serialize();
 }
 
 }