1 files changed, 25 insertions, 29 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.cpp
index 9b0a334..e39e6ad 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.cpp
@@ -1,48 +1,44 @@
 /*
- * Copyright (c) 2013 Remko Tronçon
- * Licensed under the GNU General Public License.
+ * 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/PubSubEventSubscriptionSerializer.h>
-#include <Swiften/Serializer/XML/XMLElement.h>
 
-
-#include <Swiften/Serializer/PayloadSerializerCollection.h>
 #include <Swiften/Base/DateTime.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
 
 using namespace Swift;
 
-PubSubEventSubscriptionSerializer::PubSubEventSubscriptionSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
+PubSubEventSubscriptionSerializer::PubSubEventSubscriptionSerializer(PayloadSerializerCollection* /*serializers*/) {
 }
 
 PubSubEventSubscriptionSerializer::~PubSubEventSubscriptionSerializer() {
 }
 
-std::string PubSubEventSubscriptionSerializer::serializePayload(boost::shared_ptr<PubSubEventSubscription> payload) const {
-	if (!payload) {
-		return "";
-	}
-	XMLElement element("subscription", "http://jabber.org/protocol/pubsub#event");
-	element.setAttribute("node", payload->getNode());
-	element.setAttribute("jid", payload->getJID());
-	element.setAttribute("subscription", serializeSubscriptionType(payload->getSubscription()));
-	if (payload->getSubscriptionID()) {
-		element.setAttribute("subid", *payload->getSubscriptionID());
-	}
-	element.setAttribute("expiry", dateTimeToString(payload->getExpiry()));
-	return element.serialize();
+std::string PubSubEventSubscriptionSerializer::serializePayload(std::shared_ptr<PubSubEventSubscription> payload) const {
+    if (!payload) {
+        return "";
+    }
+    XMLElement element("subscription", "http://jabber.org/protocol/pubsub#event");
+    element.setAttribute("node", payload->getNode());
+    element.setAttribute("jid", payload->getJID());
+    element.setAttribute("subscription", serializeSubscriptionType(payload->getSubscription()));
+    if (payload->getSubscriptionID()) {
+        element.setAttribute("subid", *payload->getSubscriptionID());
+    }
+    element.setAttribute("expiry", dateTimeToString(payload->getExpiry()));
+    return element.serialize();
 }
 
 std::string PubSubEventSubscriptionSerializer::serializeSubscriptionType(PubSubEventSubscription::SubscriptionType value) {
-	switch (value) {
-		case PubSubEventSubscription::None: return "none";
-		case PubSubEventSubscription::Pending: return "pending";
-		case PubSubEventSubscription::Subscribed: return "subscribed";
-		case PubSubEventSubscription::Unconfigured: return "unconfigured";
-	}
-	assert(false);
-	return "";
+    switch (value) {
+        case PubSubEventSubscription::None: return "none";
+        case PubSubEventSubscription::Pending: return "pending";
+        case PubSubEventSubscription::Subscribed: return "subscribed";
+        case PubSubEventSubscription::Unconfigured: return "unconfigured";
+    }
+    assert(false);
+    return "";
 }