1 files changed, 63 insertions, 62 deletions
diff --git a/Swiften/Elements/MUCUserPayload.h b/Swiften/Elements/MUCUserPayload.h
index ed31816..dd57376 100644
--- a/Swiften/Elements/MUCUserPayload.h
+++ b/Swiften/Elements/MUCUserPayload.h
@@ -1,96 +1,97 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <string>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/Payload.h>
-#include <Swiften/Elements/MUCOccupant.h>
 #include <Swiften/Elements/MUCItem.h>
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/Payload.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
-	class SWIFTEN_API MUCUserPayload : public Payload {
-		public:
-			typedef boost::shared_ptr<MUCUserPayload> ref;
+    class SWIFTEN_API MUCUserPayload : public Payload {
+        public:
+            typedef std::shared_ptr<MUCUserPayload> ref;
+
+            struct StatusCode {
+                StatusCode() : code(0) {}
+                StatusCode(int code) : code(code) {}
+                int code;
+            };
 
-			struct StatusCode {
-				StatusCode() : code(0) {}
-				StatusCode(int code) : code(code) {}
-				int code;
-			};
+            //struct Password {
 
-			//struct Password {
+            //}
 
-			//}
+            // struct History {
 
-			// struct History {
+            // }
 
-			// }
+            /**
+             * reason is optional.
+             * from and to are mutually exclusive.
+             * From is used for MUC sending to invited client. To is used sending to MUC from inviting client.
+             * from is the JID the MUC claims the invite is from.
+             * to is the JID to send the invite to.
+             */
+            struct Invite {
+                std::string reason;
+                JID from;
+                JID to;
+            };
 
-			/**
-			 * reason is optional.
-			 * from and to are mutually exclusive.
-			 * From is used for MUC sending to invited client. To is used sending to MUC from inviting client.
-			 * from is the JID the MUC claims the invite is from.
-			 * to is the JID to send the invite to.
-			 */
-			struct Invite {
-				std::string reason;
-				JID from;
-				JID to;
-			};
+            MUCUserPayload() {
+            }
 
-			MUCUserPayload() {
-			}
+            void addItem(const MUCItem& item) {items_.push_back(item);}
 
-			void addItem(const MUCItem& item) {items_.push_back(item);}
-		
-			void addStatusCode(StatusCode code) {statusCodes_.push_back(code);}
+            void addStatusCode(StatusCode code) {statusCodes_.push_back(code);}
 
-			const std::vector<MUCItem>& getItems() const {return items_;}
+            const std::vector<MUCItem>& getItems() const {return items_;}
 
-			const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;}
+            const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;}
 
-			boost::shared_ptr<Payload> getPayload() const {
-				return payload_;
-			}
+            std::shared_ptr<Payload> getPayload() const {
+                return payload_;
+            }
 
-			void setPayload(boost::shared_ptr<Payload> p) {
-				payload_ = p;
-			}
+            void setPayload(std::shared_ptr<Payload> p) {
+                payload_ = p;
+            }
 
-			const boost::optional<std::string>& getPassword() const {
-				return password_;
-			}
+            const boost::optional<std::string>& getPassword() const {
+                return password_;
+            }
 
-			void setPassword(const std::string& password) {
-				password_ = password;
-			}
+            void setPassword(const std::string& password) {
+                password_ = password;
+            }
 
 
-			const boost::optional<Invite>& getInvite() const {
-				return invite_;
-			}
+            const boost::optional<Invite>& getInvite() const {
+                return invite_;
+            }
 
-			void setInvite(const Invite& invite) {
-				invite_ = invite;
-			}
+            void setInvite(const Invite& invite) {
+                invite_ = invite;
+            }
 
 
-		private:
-			std::vector<MUCItem> items_;
-			std::vector<StatusCode> statusCodes_;
-			boost::shared_ptr<Payload> payload_;
-			boost::optional<std::string> password_;
-			boost::optional<Invite> invite_;
-	};
+        private:
+            std::vector<MUCItem> items_;
+            std::vector<StatusCode> statusCodes_;
+            std::shared_ptr<Payload> payload_;
+            boost::optional<std::string> password_;
+            boost::optional<Invite> invite_;
+    };
 }