1 files changed, 17 insertions, 14 deletions
diff --git a/Swiften/Elements/MUCUserPayload.h b/Swiften/Elements/MUCUserPayload.h
index 7460c35..c9ea62c 100644
--- a/Swiften/Elements/MUCUserPayload.h
+++ b/Swiften/Elements/MUCUserPayload.h
@@ -11,25 +11,19 @@
 #include <string>
 #include <vector>
 
-#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/Payload.h"
-#include "Swiften/Elements/MUCOccupant.h"
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/Payload.h>
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/MUCItem.h>
 
 namespace Swift {
 	class MUCUserPayload : public Payload {
 		public:
 			typedef boost::shared_ptr<MUCUserPayload> ref;
 
-			struct Item {
-				Item(MUCOccupant::Affiliation affiliation = MUCOccupant::NoAffiliation, MUCOccupant::Role role = MUCOccupant::NoRole) : affiliation(affiliation), role(role) {}
-				boost::optional<JID> realJID;
-				boost::optional<std::string> nick;
-				MUCOccupant::Affiliation affiliation;
-				MUCOccupant::Role role;
-			};
-
 			struct StatusCode {
 				StatusCode() : code(0) {}
+				StatusCode(int code) : code(code) {}
 				int code;
 			};
 
@@ -48,16 +42,25 @@ namespace Swift {
 			MUCUserPayload() {
 			}
 
-			void addItem(Item item) {items_.push_back(item);}
+			void addItem(const MUCItem& item) {items_.push_back(item);}
 		
 			void addStatusCode(StatusCode code) {statusCodes_.push_back(code);}
 
-			const std::vector<Item>& getItems() const {return items_;}
+			const std::vector<MUCItem>& getItems() const {return items_;}
 
 			const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;}
 
+			boost::shared_ptr<Payload> getPayload() const {
+				return payload_;
+			}
+
+			void setPayload(boost::shared_ptr<Payload> p) {
+				payload_ = p;
+			}
+
 		private:
-			std::vector<Item> items_;
+			std::vector<MUCItem> items_;
 			std::vector<StatusCode> statusCodes_;
+			boost::shared_ptr<Payload> payload_;
 	};
 }