1 files changed, 38 insertions, 37 deletions
diff --git a/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp b/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp
index 909e82f..d5d5c0a 100644
--- a/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp
+++ b/Swiften/Parser/PayloadParsers/PubSubRetractParser.cpp
@@ -1,18 +1,15 @@
 /*
- * 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/PubSubRetractParser.h>
 
 #include <boost/optional.hpp>
 
-
-#include <Swiften/Parser/PayloadParserFactoryCollection.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
 #include <Swiften/Parser/PayloadParsers/PubSubItemParser.h>
 
 using namespace Swift;
@@ -24,45 +21,49 @@ PubSubRetractParser::~PubSubRetractParser() {
 }
 
 void PubSubRetractParser::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("notify")) {
-			getPayloadInternal()->setNotify(*attributeValue == "true" ? true : false);
-		}
-	}
+    if (level == 0) {
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+            getPayloadInternal()->setNode(*attributeValue);
+        }
+        if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("notify")) {
+            boost::optional<bool> notify;
+            if (attributeValue.is_initialized()) {
+                notify = (attributeValue.get() == "true" || attributeValue.get() == "1") ? true : false;
+            }
+            getPayloadInternal()->setNotify(notify);
+        }
+    }
 
-	if (level == 1) {
-		if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubItemParser>(parsers);
-		}
-	}
+    if (level == 1) {
+        if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubItemParser>(parsers);
+        }
+    }
 
-	if (level >= 1 && currentPayloadParser) {
-		currentPayloadParser->handleStartElement(element, ns, attributes);
-	}
-	++level;
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleStartElement(element, ns, attributes);
+    }
+    ++level;
 }
 
 void PubSubRetractParser::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 (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
-				getPayloadInternal()->addItem(boost::dynamic_pointer_cast<PubSubItem>(currentPayloadParser->getPayload()));
-			}
-			currentPayloadParser.reset();
-		}
-	}
+        if (level == 1) {
+            if (element == "item" && ns == "http://jabber.org/protocol/pubsub") {
+                getPayloadInternal()->addItem(std::dynamic_pointer_cast<PubSubItem>(currentPayloadParser->getPayload()));
+            }
+            currentPayloadParser.reset();
+        }
+    }
 }
 
 void PubSubRetractParser::handleCharacterData(const std::string& data) {
-	if (level > 1 && currentPayloadParser) {
-		currentPayloadParser->handleCharacterData(data);
-	}
+    if (level > 1 && currentPayloadParser) {
+        currentPayloadParser->handleCharacterData(data);
+    }
 }