1 files changed, 35 insertions, 34 deletions
diff --git a/Swiften/Parser/Tree/ParserElement.h b/Swiften/Parser/Tree/ParserElement.h
index 07cc153..38f2dee 100644
--- a/Swiften/Parser/Tree/ParserElement.h
+++ b/Swiften/Parser/Tree/ParserElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,43 +7,44 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <vector>
+
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Parser/AttributeMap.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 namespace Swift {
-	class SWIFTEN_API ParserElement {
-		public:
-			typedef boost::shared_ptr<ParserElement> ref;
-
-			ParserElement(const std::string& name, const std::string& xmlns, const AttributeMap& attributes);
-			virtual ~ParserElement();
-
-			const std::string& getText() const { return text_; }
-			const std::string& getName() const { return name_; }
-			const std::string& getNamespace() const { return xmlns_; }
-			const AttributeMap& getAttributes() const { return attributes_; }
-
-			ParserElement::ref addChild(const std::string& name, const std::string& xmlns, const AttributeMap& attributes);
-			void appendCharacterData(const std::string& data);
-
-			std::vector<ParserElement::ref> getChildren(const std::string& name, const std::string& xmlns) const;
-			const std::vector<ParserElement::ref>& getAllChildren() const {return children_;}
-			ParserElement::ref getChild(const std::string& name, const std::string& xmlns) const;
-
-			virtual operator bool() {
-				return true;
-			}
-
-		private:
-			std::vector<ParserElement::ref> children_;
-			std::string name_;
-			std::string xmlns_;
-			AttributeMap attributes_;
-			std::string text_;
-	};
+    class SWIFTEN_API ParserElement {
+        public:
+            typedef std::shared_ptr<ParserElement> ref;
+
+            ParserElement(const std::string& name, const std::string& xmlns, const AttributeMap& attributes);
+            virtual ~ParserElement();
+
+            const std::string& getText() const { return text_; }
+            const std::string& getName() const { return name_; }
+            const std::string& getNamespace() const { return xmlns_; }
+            const AttributeMap& getAttributes() const { return attributes_; }
+
+            ParserElement::ref addChild(const std::string& name, const std::string& xmlns, const AttributeMap& attributes);
+            void appendCharacterData(const std::string& data);
+
+            std::vector<ParserElement::ref> getChildren(const std::string& name, const std::string& xmlns) const;
+            const std::vector<ParserElement::ref>& getAllChildren() const {return children_;}
+            ParserElement::ref getChild(const std::string& name, const std::string& xmlns) const;
+
+            virtual operator bool() {
+                return true;
+            }
+
+        private:
+            std::vector<ParserElement::ref> children_;
+            std::string name_;
+            std::string xmlns_;
+            AttributeMap attributes_;
+            std::string text_;
+    };
 }