1 files changed, 86 insertions, 88 deletions
diff --git a/Swiften/Parser/PayloadParsers/PubSubParser.cpp b/Swiften/Parser/PayloadParsers/PubSubParser.cpp
index c6574a8..eef6e5e 100644
--- a/Swiften/Parser/PayloadParsers/PubSubParser.cpp
+++ b/Swiften/Parser/PayloadParsers/PubSubParser.cpp
@@ -1,31 +1,29 @@
 /*
- * 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/PubSubParser.h>
 
 #include <boost/optional.hpp>
 
-
-#include <Swiften/Parser/PayloadParserFactoryCollection.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
-#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h>
+#include <Swiften/Parser/PayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubConfigureParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubDefaultParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubCreateParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubDefaultParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubItemsParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubOptionsParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubPublishParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubOptionsParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h>
-#include <Swiften/Parser/PayloadParsers/PubSubItemsParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubRetractParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h>
 
 using namespace Swift;
 
@@ -36,90 +34,90 @@ PubSubParser::~PubSubParser() {
 }
 
 void PubSubParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
-	if (level == 1) {
-		if (element == "items" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubItemsParser>(parsers);
-		}
-		if (element == "create" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubCreateParser>(parsers);
-		}
-		if (element == "publish" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubPublishParser>(parsers);
-		}
-		if (element == "affiliations" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubAffiliationsParser>(parsers);
-		}
-		if (element == "retract" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubRetractParser>(parsers);
-		}
-		if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubOptionsParser>(parsers);
-		}
-		if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubConfigureParser>(parsers);
-		}
-		if (element == "default" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubDefaultParser>(parsers);
-		}
-		if (element == "subscriptions" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubSubscriptionsParser>(parsers);
-		}
-		if (element == "subscribe" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubSubscribeParser>(parsers);
-		}
-		if (element == "unsubscribe" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubUnsubscribeParser>(parsers);
-		}
-		if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub") {
-			currentPayloadParser = boost::make_shared<PubSubSubscriptionParser>(parsers);
-		}
-	}
+    if (level == 1) {
+        if (element == "items" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubItemsParser>(parsers);
+        }
+        if (element == "create" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubCreateParser>(parsers);
+        }
+        if (element == "publish" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubPublishParser>(parsers);
+        }
+        if (element == "affiliations" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubAffiliationsParser>(parsers);
+        }
+        if (element == "retract" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubRetractParser>(parsers);
+        }
+        if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubOptionsParser>(parsers);
+        }
+        if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubConfigureParser>(parsers);
+        }
+        if (element == "default" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubDefaultParser>(parsers);
+        }
+        if (element == "subscriptions" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubSubscriptionsParser>(parsers);
+        }
+        if (element == "subscribe" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubSubscribeParser>(parsers);
+        }
+        if (element == "unsubscribe" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubUnsubscribeParser>(parsers);
+        }
+        if (element == "subscription" && ns == "http://jabber.org/protocol/pubsub") {
+            currentPayloadParser = std::make_shared<PubSubSubscriptionParser>(parsers);
+        }
+    }
 
-	if (level >= 1 && currentPayloadParser) {
-		currentPayloadParser->handleStartElement(element, ns, attributes);
-	}
-	++level;
+    if (level >= 1 && currentPayloadParser) {
+        currentPayloadParser->handleStartElement(element, ns, attributes);
+    }
+    ++level;
 }
 
 void PubSubParser::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 (currentPayloadParser) {
-				if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
-					optionsPayload = boost::dynamic_pointer_cast<PubSubOptions>(currentPayloadParser->getPayload());
-				}
-				else if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
-					configurePayload = boost::dynamic_pointer_cast<PubSubConfigure>(currentPayloadParser->getPayload());
-				}
-				else {
-					getPayloadInternal()->setPayload(boost::dynamic_pointer_cast<PubSubPayload>(currentPayloadParser->getPayload()));
-				}
-			}
-			currentPayloadParser.reset();
-		}
+        if (level == 1) {
+            if (currentPayloadParser) {
+                if (element == "options" && ns == "http://jabber.org/protocol/pubsub") {
+                    optionsPayload = std::dynamic_pointer_cast<PubSubOptions>(currentPayloadParser->getPayload());
+                }
+                else if (element == "configure" && ns == "http://jabber.org/protocol/pubsub") {
+                    configurePayload = std::dynamic_pointer_cast<PubSubConfigure>(currentPayloadParser->getPayload());
+                }
+                else {
+                    getPayloadInternal()->setPayload(std::dynamic_pointer_cast<PubSubPayload>(currentPayloadParser->getPayload()));
+                }
+            }
+            currentPayloadParser.reset();
+        }
 
-		if (level == 0) {
-			if (boost::shared_ptr<PubSubCreate> create = boost::dynamic_pointer_cast<PubSubCreate>(getPayloadInternal()->getPayload())) {
-				if (configurePayload) {
-					create->setConfigure(configurePayload);
-				}
-			}
-			if (boost::shared_ptr<PubSubSubscribe> subscribe = boost::dynamic_pointer_cast<PubSubSubscribe>(getPayloadInternal()->getPayload())) {
-				if (optionsPayload) {
-					subscribe->setOptions(optionsPayload);
-				}
-			}
-		}
-	}
+        if (level == 0) {
+            if (std::shared_ptr<PubSubCreate> create = std::dynamic_pointer_cast<PubSubCreate>(getPayloadInternal()->getPayload())) {
+                if (configurePayload) {
+                    create->setConfigure(configurePayload);
+                }
+            }
+            if (std::shared_ptr<PubSubSubscribe> subscribe = std::dynamic_pointer_cast<PubSubSubscribe>(getPayloadInternal()->getPayload())) {
+                if (optionsPayload) {
+                    subscribe->setOptions(optionsPayload);
+                }
+            }
+        }
+    }
 }
 
 void PubSubParser::handleCharacterData(const std::string& data) {
-	if (level > 1 && currentPayloadParser) {
-		currentPayloadParser->handleCharacterData(data);
-	}
+    if (level > 1 && currentPayloadParser) {
+        currentPayloadParser->handleCharacterData(data);
+    }
 }