1 files changed, 41 insertions, 47 deletions
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp
index 9308101..45c16f6 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp
+++ b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.cpp
@@ -1,76 +1,70 @@
 /*
- * 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/Parser/PayloadParsers/PubSubEventSubscriptionParser.h>
 
 #include <boost/optional.hpp>
 
-
-#include <Swiften/Parser/PayloadParserFactoryCollection.h>
-#include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Base/DateTime.h>
 #include <Swiften/Parser/EnumParser.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
 
 using namespace Swift;
 
-PubSubEventSubscriptionParser::PubSubEventSubscriptionParser(PayloadParserFactoryCollection* parsers) : parsers(parsers), level(0) {
+PubSubEventSubscriptionParser::PubSubEventSubscriptionParser(PayloadParserFactoryCollection* /*parsers*/) : level(0) {
 }
 
 PubSubEventSubscriptionParser::~PubSubEventSubscriptionParser() {
 }
 
 void PubSubEventSubscriptionParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
-	if (level == 0) {
-		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
-			getPayloadInternal()->setNode(*attributeValue);
-		}
-		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
-			if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
-				getPayloadInternal()->setJID(*jid);
-			}
-		}
-		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subscription")) {
-			if (boost::optional<PubSubEventSubscription::SubscriptionType> value = EnumParser<PubSubEventSubscription::SubscriptionType>()(PubSubEventSubscription::None, "none")(PubSubEventSubscription::Pending, "pending")(PubSubEventSubscription::Subscribed, "subscribed")(PubSubEventSubscription::Unconfigured, "unconfigured").parse(*attributeValue)) {
-				getPayloadInternal()->setSubscription(*value);
-			}
-		}
-		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
-			getPayloadInternal()->setSubscriptionID(*attributeValue);
-		}
-		if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("expiry")) {
-				getPayloadInternal()->setExpiry(stringToDateTime(*attributeValue));
-		}
-	}
-
-	
+    if (level == 0) {
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+            getPayloadInternal()->setNode(*attributeValue);
+        }
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
+            if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
+                getPayloadInternal()->setJID(*jid);
+            }
+        }
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subscription")) {
+            if (boost::optional<PubSubEventSubscription::SubscriptionType> value = EnumParser<PubSubEventSubscription::SubscriptionType>()(PubSubEventSubscription::None, "none")(PubSubEventSubscription::Pending, "pending")(PubSubEventSubscription::Subscribed, "subscribed")(PubSubEventSubscription::Unconfigured, "unconfigured").parse(*attributeValue)) {
+                getPayloadInternal()->setSubscription(*value);
+            }
+        }
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("subid")) {
+            getPayloadInternal()->setSubscriptionID(*attributeValue);
+        }
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("expiry")) {
+                getPayloadInternal()->setExpiry(stringToDateTime(*attributeValue));
+        }
+    }
 
-	if (level >= 1 && currentPayloadParser) {
-		currentPayloadParser->handleStartElement(element, ns, attributes);
-	}
-	++level;
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleStartElement(element, ns, attributes);
+    }
+    ++level;
 }
 
 void PubSubEventSubscriptionParser::handleEndElement(const std::string& element, const std::string& ns) {
-	--level;
-	if (currentPayloadParser) {
-		if (level >= 1) {
-			currentPayloadParser->handleEndElement(element, ns);
-		}
+    --level;
+    if (currentPayloadParser) {
+        if (level >= 1) {
+            currentPayloadParser->handleEndElement(element, ns);
+        }
+
+        if (level == 1) {
 
-		if (level == 1) {
-			
-			currentPayloadParser.reset();
-		}
-	}
+            currentPayloadParser.reset();
+        }
+    }
 }
 
 void PubSubEventSubscriptionParser::handleCharacterData(const std::string& data) {
-	if (level > 1 && currentPayloadParser) {
-		currentPayloadParser->handleCharacterData(data);
-	}
+    if (level > 1 && currentPayloadParser) {
+        currentPayloadParser->handleCharacterData(data);
+    }
 }