1 files changed, 15 insertions, 32 deletions
diff --git a/Swiften/Elements/Presence.h b/Swiften/Elements/Presence.h
index 7f957ba..28a9ee5 100644
--- a/Swiften/Elements/Presence.h
+++ b/Swiften/Elements/Presence.h
@@ -6,11 +6,10 @@
 
 #pragma once
 
+#include <boost/smart_ptr/make_shared.hpp>
 
-#include "Swiften/Elements/Stanza.h"
-#include "Swiften/Elements/Status.h"
-#include "Swiften/Elements/StatusShow.h"
-#include "Swiften/Elements/Priority.h"
+#include <Swiften/Elements/Stanza.h>
+#include <Swiften/Elements/StatusShow.h>
 
 namespace Swift {
 	class Presence : public Stanza {
@@ -19,21 +18,20 @@ namespace Swift {
 
 			enum Type { Available, Error, Probe, Subscribe, Subscribed, Unavailable, Unsubscribe, Unsubscribed };
 
-			Presence() : type_(Available) /*, showType_(Online)*/ {}
-			Presence(const std::string& status) : type_(Available) {
-				setStatus(status);
-			}
+			Presence();
+			Presence(const std::string& status);
+			virtual ~Presence();
 
 			static ref create() {
-				return ref(new Presence());
+				return boost::make_shared<Presence>();
 			}
 
 			static ref create(const std::string& status) {
-				return ref(new Presence(status));
+				return boost::make_shared<Presence>(status);
 			}
 
 			static ref create(Presence::ref presence) {
-				return ref(new Presence(*presence));
+				return boost::make_shared<Presence>(*presence);
 			}
 
 			Type getType() const { return type_; }
@@ -48,32 +46,17 @@ namespace Swift {
 			}
 
 			void setShow(const StatusShow::Type &show) { 
-				updatePayload(boost::shared_ptr<StatusShow>(new StatusShow(show)));
-			}
-
-			std::string getStatus() const { 
-				boost::shared_ptr<Status> status(getPayload<Status>());
-				if (status) {
-					return status->getText();
-				}
-				return "";
+				updatePayload(boost::make_shared<StatusShow>(show));
 			}
 
-			void setStatus(const std::string& status) { 
-				updatePayload(boost::shared_ptr<Status>(new Status(status)));
-			}
-
-			int getPriority() const {
-				boost::shared_ptr<Priority> priority(getPayload<Priority>());
-				return (priority ? priority->getPriority() : 0);
-			}
+			std::string getStatus() const;
+			void setStatus(const std::string& status);
 
-			void setPriority(int priority) {
-				updatePayload(boost::shared_ptr<Priority>(new Priority(priority)));
-			}
+			int getPriority() const;
+			void setPriority(int priority);
 
 			boost::shared_ptr<Presence> clone() const {
-				return boost::shared_ptr<Presence>(new Presence(*this));
+				return boost::make_shared<Presence>(*this);
 			}
 
 			bool isAvailable() const {