1 files changed, 20 insertions, 25 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.cpp
index c101623..e41e09e 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.cpp
@@ -1,44 +1,39 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#pragma clang diagnostic ignored "-Wunused-private-field"
-
 #include <Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
-
-
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
 
+#include <Swiften/Serializer/XML/XMLElement.h>
 
 using namespace Swift;
 
-PubSubDefaultSerializer::PubSubDefaultSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
+PubSubDefaultSerializer::PubSubDefaultSerializer(PayloadSerializerCollection* /*serializers*/) {
 }
 
 PubSubDefaultSerializer::~PubSubDefaultSerializer() {
 }
 
-std::string PubSubDefaultSerializer::serializePayload(boost::shared_ptr<PubSubDefault> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("default", "http://jabber.org/protocol/pubsub");
-	if (payload->getNode()) {
-		element.setAttribute("node", *payload->getNode());
-	}
-	element.setAttribute("type", serializeType(payload->getType()));
-	return element.serialize();
+std::string PubSubDefaultSerializer::serializePayload(std::shared_ptr<PubSubDefault> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("default", "http://jabber.org/protocol/pubsub");
+    if (payload->getNode()) {
+        element.setAttribute("node", *payload->getNode());
+    }
+    element.setAttribute("type", serializeType(payload->getType()));
+    return element.serialize();
 }
 
 std::string PubSubDefaultSerializer::serializeType(PubSubDefault::Type value) {
-	switch (value) {
-		case PubSubDefault::None: return "none";
-		case PubSubDefault::Collection: return "collection";
-		case PubSubDefault::Leaf: return "leaf";
-	}
-	assert(false);
-	return "";
+    switch (value) {
+        case PubSubDefault::None: return "none";
+        case PubSubDefault::Collection: return "collection";
+        case PubSubDefault::Leaf: return "leaf";
+    }
+    assert(false);
+    return "";
 }