1 files changed, 32 insertions, 34 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.cpp b/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.cpp
index fd6eebd..687b566 100644
--- a/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.cpp
@@ -1,54 +1,52 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#pragma clang diagnostic ignored "-Wunused-private-field"
-
 #include <Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
+
+#include <memory>
+
 #include <boost/lexical_cast.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 
 using namespace Swift;
 
-UserTuneSerializer::UserTuneSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
+UserTuneSerializer::UserTuneSerializer(PayloadSerializerCollection* /*serializers*/) {
 }
 
 UserTuneSerializer::~UserTuneSerializer() {
 }
 
-std::string UserTuneSerializer::serializePayload(boost::shared_ptr<UserTune> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("tune", "http://jabber.org/protocol/tune");
-	if (payload->getRating()) {
-		element.addNode(boost::make_shared<XMLElement>("rating", "", boost::lexical_cast<std::string>(*payload->getRating())));
-	}
-	if (payload->getTitle()) {
-		element.addNode(boost::make_shared<XMLElement>("title", "", *payload->getTitle()));
-	}
-	if (payload->getTrack()) {
-		element.addNode(boost::make_shared<XMLElement>("track", "", *payload->getTrack()));
-	}
-	if (payload->getArtist()) {
-		element.addNode(boost::make_shared<XMLElement>("artist", "", *payload->getArtist()));
-	}
-	if (payload->getURI()) {
-		element.addNode(boost::make_shared<XMLElement>("uri", "", *payload->getURI()));
-	}
-	if (payload->getSource()) {
-		element.addNode(boost::make_shared<XMLElement>("source", "", *payload->getSource()));
-	}
-	if (payload->getLength()) {
-		element.addNode(boost::make_shared<XMLElement>("length", "", boost::lexical_cast<std::string>(*payload->getLength())));
-	}
-	return element.serialize();
+std::string UserTuneSerializer::serializePayload(std::shared_ptr<UserTune> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("tune", "http://jabber.org/protocol/tune");
+    if (payload->getRating()) {
+        element.addNode(std::make_shared<XMLElement>("rating", "", boost::lexical_cast<std::string>(*payload->getRating())));
+    }
+    if (payload->getTitle()) {
+        element.addNode(std::make_shared<XMLElement>("title", "", *payload->getTitle()));
+    }
+    if (payload->getTrack()) {
+        element.addNode(std::make_shared<XMLElement>("track", "", *payload->getTrack()));
+    }
+    if (payload->getArtist()) {
+        element.addNode(std::make_shared<XMLElement>("artist", "", *payload->getArtist()));
+    }
+    if (payload->getURI()) {
+        element.addNode(std::make_shared<XMLElement>("uri", "", *payload->getURI()));
+    }
+    if (payload->getSource()) {
+        element.addNode(std::make_shared<XMLElement>("source", "", *payload->getSource()));
+    }
+    if (payload->getLength()) {
+        element.addNode(std::make_shared<XMLElement>("length", "", boost::lexical_cast<std::string>(*payload->getLength())));
+    }
+    return element.serialize();
 }