1 files changed, 18 insertions, 13 deletions
diff --git a/Swiften/Parser/PayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParserFactoryCollection.cpp
index e3efc3d..bca1e83 100644
--- a/Swiften/Parser/PayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParserFactoryCollection.cpp
@@ -1,37 +1,42 @@
 /*
- * 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/Parser/PayloadParserFactoryCollection.h>
+
 #include <algorithm>
 
-#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <boost/bind.hpp>
+
 #include <Swiften/Parser/PayloadParserFactory.h>
 
 namespace Swift {
 
-PayloadParserFactoryCollection::PayloadParserFactoryCollection() : defaultFactory_(NULL) {
+PayloadParserFactoryCollection::PayloadParserFactoryCollection() : defaultFactory_(nullptr) {
+}
+
+PayloadParserFactoryCollection::~PayloadParserFactoryCollection() {
 }
 
 void PayloadParserFactoryCollection::addFactory(PayloadParserFactory* factory) {
-	factories_.push_back(factory);
+    factories_.push_back(factory);
 }
 
 void PayloadParserFactoryCollection::removeFactory(PayloadParserFactory* factory) {
-	factories_.erase(remove(factories_.begin(), factories_.end(), factory), factories_.end());
+    factories_.erase(std::remove(factories_.begin(), factories_.end(), factory), factories_.end());
 }
 
 void PayloadParserFactoryCollection::setDefaultFactory(PayloadParserFactory* factory) {
-	defaultFactory_ = factory;
+    defaultFactory_ = factory;
 }
 
 PayloadParserFactory* PayloadParserFactoryCollection::getPayloadParserFactory(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
-	std::vector<PayloadParserFactory*>::reverse_iterator i = std::find_if(
-			factories_.rbegin(), factories_.rend(), 
-			boost::bind(&PayloadParserFactory::canParse, _1, element, ns, attributes));
-	return (i != factories_.rend() ? *i : defaultFactory_);
+    std::vector<PayloadParserFactory*>::reverse_iterator i = std::find_if(
+            factories_.rbegin(), factories_.rend(),
+            boost::bind(&PayloadParserFactory::canParse, _1, element, ns, attributes));
+    return (i != factories_.rend() ? *i : defaultFactory_);
 }
 
 }