1 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Serializer/PayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializerCollection.cpp
index ab2b4f4..114512e 100644
--- a/Swiften/Serializer/PayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializerCollection.cpp
@@ -1,13 +1,15 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
-#include <boost/bind.hpp>
+#include <Swiften/Serializer/PayloadSerializerCollection.h>
+
 #include <algorithm>
 
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
+#include <boost/bind.hpp>
+
 #include <Swiften/Serializer/PayloadSerializer.h>
 
 namespace Swift {
@@ -15,19 +17,22 @@ namespace Swift {
 PayloadSerializerCollection::PayloadSerializerCollection() {
 }
 
+PayloadSerializerCollection::~PayloadSerializerCollection() {
+}
+
 void PayloadSerializerCollection::addSerializer(PayloadSerializer* serializer) {
-	serializers_.push_back(serializer);
+    serializers_.push_back(serializer);
 }
 
 void PayloadSerializerCollection::removeSerializer(PayloadSerializer* serializer) {
-	serializers_.erase(remove(serializers_.begin(), serializers_.end(), serializer), serializers_.end());
+    serializers_.erase(std::remove(serializers_.begin(), serializers_.end(), serializer), serializers_.end());
 }
 
-PayloadSerializer* PayloadSerializerCollection::getPayloadSerializer(boost::shared_ptr<Payload> payload) const {
-	std::vector<PayloadSerializer*>::const_iterator i = std::find_if(
-			serializers_.begin(), serializers_.end(), 
-			boost::bind(&PayloadSerializer::canSerialize, _1, payload));
-	return (i != serializers_.end() ? *i : NULL);
+PayloadSerializer* PayloadSerializerCollection::getPayloadSerializer(std::shared_ptr<Payload> payload) const {
+    std::vector<PayloadSerializer*>::const_iterator i = std::find_if(
+            serializers_.begin(), serializers_.end(),
+            boost::bind(&PayloadSerializer::canSerialize, _1, payload));
+    return (i != serializers_.end() ? *i : nullptr);
 }
 
 }