1 files changed, 38 insertions, 37 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
index 909726a..4f0f637 100644
--- a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
@@ -1,57 +1,58 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h>
 
-#include <boost/lexical_cast.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
+
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/lexical_cast.hpp>
 
+#include <Swiften/Base/String.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLTextNode.h>
-#include <Swiften/Base/String.h>
 
 namespace Swift {
 
 MUCPayloadSerializer::MUCPayloadSerializer() : GenericPayloadSerializer<MUCPayload>() {
 }
 
-std::string MUCPayloadSerializer::serializePayload(boost::shared_ptr<MUCPayload> muc)  const {
-	XMLElement mucElement("x", "http://jabber.org/protocol/muc");
-	boost::shared_ptr<XMLElement> historyElement(new XMLElement("history"));
-	bool history = false;
-	if (muc->getMaxChars() >= 0) {
-		historyElement->setAttribute("maxchars", boost::lexical_cast<std::string>(muc->getMaxChars()));
-		history = true;
-	}
-	if (muc->getMaxStanzas() >= 0) {
-		historyElement->setAttribute("maxstanzas", boost::lexical_cast<std::string>(muc->getMaxStanzas()));
-		history = true;
-	}
-	if (muc->getSeconds() >= 0) {
-		historyElement->setAttribute("seconds", boost::lexical_cast<std::string>(muc->getSeconds()));
-		history = true;
-	}
-	if (muc->getSince() != boost::posix_time::not_a_date_time) {
-		std::string sinceString = std::string(boost::posix_time::to_iso_extended_string(muc->getSince()));
-		String::replaceAll(sinceString, ',', ".");
-		sinceString += "Z";
-		historyElement->setAttribute("since", sinceString);
-		history = true;
-	}
-	if (muc->getPassword()) {
-		std::string password = *muc->getPassword();
-		boost::shared_ptr<XMLElement> passwordElement(new XMLElement("password"));
-		passwordElement->addNode(boost::make_shared<XMLTextNode>(password));
-		mucElement.addNode(passwordElement);
-	}
-	if (history) {
-		mucElement.addNode(historyElement);
-	}
-	return mucElement.serialize();
+std::string MUCPayloadSerializer::serializePayload(std::shared_ptr<MUCPayload> muc)  const {
+    XMLElement mucElement("x", "http://jabber.org/protocol/muc");
+    std::shared_ptr<XMLElement> historyElement(new XMLElement("history"));
+    bool history = false;
+    if (muc->getMaxChars() >= 0) {
+        historyElement->setAttribute("maxchars", boost::lexical_cast<std::string>(muc->getMaxChars()));
+        history = true;
+    }
+    if (muc->getMaxStanzas() >= 0) {
+        historyElement->setAttribute("maxstanzas", boost::lexical_cast<std::string>(muc->getMaxStanzas()));
+        history = true;
+    }
+    if (muc->getSeconds() >= 0) {
+        historyElement->setAttribute("seconds", boost::lexical_cast<std::string>(muc->getSeconds()));
+        history = true;
+    }
+    if (muc->getSince() != boost::posix_time::not_a_date_time) {
+        std::string sinceString = std::string(boost::posix_time::to_iso_extended_string(muc->getSince()));
+        String::replaceAll(sinceString, ',', ".");
+        sinceString += "Z";
+        historyElement->setAttribute("since", sinceString);
+        history = true;
+    }
+    if (muc->getPassword()) {
+        std::string password = *muc->getPassword();
+        std::shared_ptr<XMLElement> passwordElement(new XMLElement("password"));
+        passwordElement->addNode(std::make_shared<XMLTextNode>(password));
+        mucElement.addNode(passwordElement);
+    }
+    if (history) {
+        mucElement.addNode(historyElement);
+    }
+    return mucElement.serialize();
 }
 
 }