7 files changed, 37 insertions, 38 deletions
diff --git a/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h
index ad4caf7..b187fa5 100644
--- a/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h
+++ b/Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h
@@ -13,7 +13,7 @@
 namespace Swift {
     class SWIFTEN_API GetInBandRegistrationFormRequest : public GenericRequest<InBandRegistrationPayload> {
         public:
-            typedef boost::shared_ptr<GetInBandRegistrationFormRequest> ref;
+            typedef std::shared_ptr<GetInBandRegistrationFormRequest> ref;
 
             static ref create(const JID& to, IQRouter* router) {
                 return ref(new GetInBandRegistrationFormRequest(to, router));
diff --git a/Swiften/Queries/Requests/GetPrivateStorageRequest.h b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
index eecd4d4..e5904fe 100644
--- a/Swiften/Queries/Requests/GetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
@@ -6,8 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
@@ -19,27 +18,27 @@ namespace Swift {
     template<typename PAYLOAD_TYPE>
     class SWIFTEN_API GetPrivateStorageRequest : public Request {
         public:
-            typedef boost::shared_ptr<GetPrivateStorageRequest<PAYLOAD_TYPE> > ref;
+            typedef std::shared_ptr<GetPrivateStorageRequest<PAYLOAD_TYPE> > ref;
 
             static ref create(IQRouter* router) {
                 return ref(new GetPrivateStorageRequest(router));
             }
 
         private:
-            GetPrivateStorageRequest(IQRouter* router) : Request(IQ::Get, JID(), boost::make_shared<PrivateStorage>(boost::shared_ptr<Payload>(new PAYLOAD_TYPE())), router) {
+            GetPrivateStorageRequest(IQRouter* router) : Request(IQ::Get, JID(), std::make_shared<PrivateStorage>(std::make_shared<PAYLOAD_TYPE>()), router) {
             }
 
-            virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
-                boost::shared_ptr<PrivateStorage> storage = boost::dynamic_pointer_cast<PrivateStorage>(payload);
+            virtual void handleResponse(std::shared_ptr<Payload> payload, ErrorPayload::ref error) {
+                std::shared_ptr<PrivateStorage> storage = std::dynamic_pointer_cast<PrivateStorage>(payload);
                 if (storage) {
-                    onResponse(boost::dynamic_pointer_cast<PAYLOAD_TYPE>(storage->getPayload()), error);
+                    onResponse(std::dynamic_pointer_cast<PAYLOAD_TYPE>(storage->getPayload()), error);
                 }
                 else {
-                    onResponse(boost::shared_ptr<PAYLOAD_TYPE>(), error);
+                    onResponse(std::shared_ptr<PAYLOAD_TYPE>(), error);
                 }
             }
 
         public:
-            boost::signal<void (boost::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
+            boost::signal<void (std::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
index a474be5..0a3502f 100644
--- a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
+++ b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/SecurityLabelsCatalog.h>
@@ -15,7 +15,7 @@
 namespace Swift {
     class SWIFTEN_API GetSecurityLabelsCatalogRequest : public GenericRequest<SecurityLabelsCatalog> {
         public:
-            typedef boost::shared_ptr<GetSecurityLabelsCatalogRequest> ref;
+            typedef std::shared_ptr<GetSecurityLabelsCatalogRequest> ref;
 
             static ref create(const JID& recipient, IQRouter* router) {
                 return ref(new GetSecurityLabelsCatalogRequest(recipient, router));
@@ -26,7 +26,7 @@ namespace Swift {
                     const JID& recipient,
                     IQRouter* router) :
                         GenericRequest<SecurityLabelsCatalog>(
-                            IQ::Get, JID(), boost::make_shared<SecurityLabelsCatalog>(recipient), router) {
+                            IQ::Get, JID(), std::make_shared<SecurityLabelsCatalog>(recipient), router) {
             }
     };
 }
diff --git a/Swiften/Queries/Requests/GetSoftwareVersionRequest.h b/Swiften/Queries/Requests/GetSoftwareVersionRequest.h
index 9533651..5660dd8 100644
--- a/Swiften/Queries/Requests/GetSoftwareVersionRequest.h
+++ b/Swiften/Queries/Requests/GetSoftwareVersionRequest.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/SoftwareVersion.h>
@@ -15,7 +15,7 @@
 namespace Swift {
     class SWIFTEN_API GetSoftwareVersionRequest : public GenericRequest<SoftwareVersion> {
         public:
-            typedef boost::shared_ptr<GetSoftwareVersionRequest> ref;
+            typedef std::shared_ptr<GetSoftwareVersionRequest> ref;
 
             static ref create(const JID& recipient, IQRouter* router) {
                 return ref(new GetSoftwareVersionRequest(recipient, router));
@@ -26,7 +26,7 @@ namespace Swift {
                     const JID& recipient,
                     IQRouter* router) :
                         GenericRequest<SoftwareVersion>(
-                            IQ::Get, recipient, boost::make_shared<SoftwareVersion>(), router) {
+                            IQ::Get, recipient, std::make_shared<SoftwareVersion>(), router) {
             }
     };
 }
diff --git a/Swiften/Queries/Requests/SetPrivateStorageRequest.h b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
index 703b749..7cc47fb 100644
--- a/Swiften/Queries/Requests/SetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
@@ -6,8 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
@@ -19,17 +18,17 @@ namespace Swift {
     template<typename PAYLOAD_TYPE>
     class SWIFTEN_API SetPrivateStorageRequest : public Request {
         public:
-            typedef boost::shared_ptr<SetPrivateStorageRequest<PAYLOAD_TYPE> > ref;
+            typedef std::shared_ptr<SetPrivateStorageRequest<PAYLOAD_TYPE> > ref;
 
-            static ref create(boost::shared_ptr<PAYLOAD_TYPE> payload, IQRouter* router) {
+            static ref create(std::shared_ptr<PAYLOAD_TYPE> payload, IQRouter* router) {
                 return ref(new SetPrivateStorageRequest<PAYLOAD_TYPE>(payload, router));
             }
 
         private:
-            SetPrivateStorageRequest(boost::shared_ptr<PAYLOAD_TYPE> payload, IQRouter* router) : Request(IQ::Set, JID(), boost::make_shared<PrivateStorage>(payload), router) {
+            SetPrivateStorageRequest(std::shared_ptr<PAYLOAD_TYPE> payload, IQRouter* router) : Request(IQ::Set, JID(), std::make_shared<PrivateStorage>(payload), router) {
             }
 
-            virtual void handleResponse(boost::shared_ptr<Payload>, ErrorPayload::ref error) {
+            virtual void handleResponse(std::shared_ptr<Payload>, ErrorPayload::ref error) {
                 onResponse(error);
             }
 
diff --git a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
index 94a497b..e2ed751 100644
--- a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
+++ b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
@@ -16,7 +16,7 @@
 namespace Swift {
     class SWIFTEN_API SetInBandRegistrationRequest : public Request {
         public:
-            typedef boost::shared_ptr<SetInBandRegistrationRequest> ref;
+            typedef std::shared_ptr<SetInBandRegistrationRequest> ref;
 
             static ref create(const JID& to, InBandRegistrationPayload::ref payload, IQRouter* router) {
                 return ref(new SetInBandRegistrationRequest(to, payload, router));
@@ -26,11 +26,11 @@ namespace Swift {
             SetInBandRegistrationRequest(const JID& to, InBandRegistrationPayload::ref payload, IQRouter* router) : Request(IQ::Set, to, InBandRegistrationPayload::ref(payload), router) {
             }
 
-            virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
+            virtual void handleResponse(std::shared_ptr<Payload> payload, ErrorPayload::ref error) {
                 onResponse(payload, error);
             }
 
         public:
-            boost::signal<void (boost::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
+            boost::signal<void (std::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp b/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp
index 1efe523..6c4c495 100644
--- a/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp
+++ b/Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp
@@ -4,8 +4,9 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
+
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -49,9 +50,9 @@ class GetPrivateStorageRequestTest : public CppUnit::TestFixture {
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel->iqs_.size()));
             CPPUNIT_ASSERT_EQUAL(JID(), channel->iqs_[0]->getTo());
             CPPUNIT_ASSERT_EQUAL(IQ::Get, channel->iqs_[0]->getType());
-            boost::shared_ptr<PrivateStorage> storage = channel->iqs_[0]->getPayload<PrivateStorage>();
+            std::shared_ptr<PrivateStorage> storage = channel->iqs_[0]->getPayload<PrivateStorage>();
             CPPUNIT_ASSERT(storage);
-            boost::shared_ptr<MyPayload> payload = boost::dynamic_pointer_cast<MyPayload>(storage->getPayload());
+            std::shared_ptr<MyPayload> payload = std::dynamic_pointer_cast<MyPayload>(storage->getPayload());
             CPPUNIT_ASSERT(payload);
         }
 
@@ -62,7 +63,7 @@ class GetPrivateStorageRequestTest : public CppUnit::TestFixture {
             channel->onIQReceived(createResponse("test-id", "foo"));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(responses.size()));
-            CPPUNIT_ASSERT_EQUAL(std::string("foo"), boost::dynamic_pointer_cast<MyPayload>(responses[0])->text);
+            CPPUNIT_ASSERT_EQUAL(std::string("foo"), std::dynamic_pointer_cast<MyPayload>(responses[0])->text);
         }
 
         void testHandleResponse_Error() {
@@ -76,7 +77,7 @@ class GetPrivateStorageRequestTest : public CppUnit::TestFixture {
         }
 
     private:
-        void handleResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref e) {
+        void handleResponse(std::shared_ptr<Payload> p, ErrorPayload::ref e) {
             if (e) {
                 errors.push_back(*e);
             }
@@ -85,17 +86,17 @@ class GetPrivateStorageRequestTest : public CppUnit::TestFixture {
             }
         }
 
-        boost::shared_ptr<IQ> createResponse(const std::string& id, const std::string& text) {
-            boost::shared_ptr<IQ> iq(new IQ(IQ::Result));
-            boost::shared_ptr<PrivateStorage> storage(new PrivateStorage());
-            storage->setPayload(boost::shared_ptr<Payload>(new MyPayload(text)));
+        std::shared_ptr<IQ> createResponse(const std::string& id, const std::string& text) {
+            std::shared_ptr<IQ> iq(new IQ(IQ::Result));
+            std::shared_ptr<PrivateStorage> storage(new PrivateStorage());
+            storage->setPayload(std::make_shared<MyPayload>(text));
             iq->addPayload(storage);
             iq->setID(id);
             return iq;
         }
 
-        boost::shared_ptr<IQ> createError(const std::string& id) {
-            boost::shared_ptr<IQ> iq(new IQ(IQ::Error));
+        std::shared_ptr<IQ> createError(const std::string& id) {
+            std::shared_ptr<IQ> iq(new IQ(IQ::Error));
             iq->setID(id);
             return iq;
         }
@@ -104,7 +105,7 @@ class GetPrivateStorageRequestTest : public CppUnit::TestFixture {
         IQRouter* router;
         DummyIQChannel* channel;
         std::vector< ErrorPayload > errors;
-        std::vector< boost::shared_ptr<Payload> > responses;
+        std::vector< std::shared_ptr<Payload> > responses;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(GetPrivateStorageRequestTest);