20 files changed, 125 insertions, 127 deletions
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp
index 139ee6c..337bad6 100644
--- a/Swiften/Disco/CapsManager.cpp
+++ b/Swiften/Disco/CapsManager.cpp
@@ -23,8 +23,8 @@ CapsManager::CapsManager(CapsStorage* capsStorage, StanzaChannel* stanzaChannel,
     stanzaChannel->onAvailableChanged.connect(boost::bind(&CapsManager::handleStanzaChannelAvailableChanged, this, _1));
 }
 
-void CapsManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) {
-    boost::shared_ptr<CapsInfo> capsInfo = presence->getPayload<CapsInfo>();
+void CapsManager::handlePresenceReceived(std::shared_ptr<Presence> presence) {
+    std::shared_ptr<CapsInfo> capsInfo = presence->getPayload<CapsInfo>();
     if (!capsInfo || capsInfo->getHash() != "sha-1" || presence->getPayload<ErrorPayload>()) {
         return;
     }
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h
index c96db13..e5d80aa 100644
--- a/Swiften/Disco/CapsManager.h
+++ b/Swiften/Disco/CapsManager.h
@@ -36,7 +36,7 @@ namespace Swift {
             }
 
         private:
-            void handlePresenceReceived(boost::shared_ptr<Presence>);
+            void handlePresenceReceived(std::shared_ptr<Presence>);
             void handleStanzaChannelAvailableChanged(bool);
             void handleDiscoInfoReceived(const JID&, const std::string& hash, DiscoInfo::ref, ErrorPayload::ref);
             void requestDiscoInfo(const JID& jid, const std::string& node, const std::string& hash);
diff --git a/Swiften/Disco/CapsMemoryStorage.h b/Swiften/Disco/CapsMemoryStorage.h
index 39559ec..15a1fd3 100644
--- a/Swiften/Disco/CapsMemoryStorage.h
+++ b/Swiften/Disco/CapsMemoryStorage.h
@@ -7,10 +7,9 @@
 #pragma once
 
 #include <map>
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <Swiften/Base/API.h>
 #include <Swiften/Disco/CapsStorage.h>
 
diff --git a/Swiften/Disco/CapsStorage.h b/Swiften/Disco/CapsStorage.h
index 5459ecf..ebfd3f3 100644
--- a/Swiften/Disco/CapsStorage.h
+++ b/Swiften/Disco/CapsStorage.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/DiscoInfo.h>
diff --git a/Swiften/Disco/DiscoInfoResponder.cpp b/Swiften/Disco/DiscoInfoResponder.cpp
index cf18f43..c94d299 100644
--- a/Swiften/Disco/DiscoInfoResponder.cpp
+++ b/Swiften/Disco/DiscoInfoResponder.cpp
@@ -6,7 +6,7 @@
 
 #include <Swiften/Disco/DiscoInfoResponder.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Queries/IQRouter.h>
@@ -31,14 +31,14 @@ void DiscoInfoResponder::setDiscoInfo(const std::string& node, const DiscoInfo&
     nodeInfo_[node] = newInfo;
 }
 
-bool DiscoInfoResponder::handleGetRequest(const JID& from, const JID&, const std::string& id, boost::shared_ptr<DiscoInfo> info) {
+bool DiscoInfoResponder::handleGetRequest(const JID& from, const JID&, const std::string& id, std::shared_ptr<DiscoInfo> info) {
     if (info->getNode().empty()) {
-        sendResponse(from, id, boost::make_shared<DiscoInfo>(info_));
+        sendResponse(from, id, std::make_shared<DiscoInfo>(info_));
     }
     else {
         std::map<std::string,DiscoInfo>::const_iterator i = nodeInfo_.find(info->getNode());
         if (i != nodeInfo_.end()) {
-            sendResponse(from, id, boost::make_shared<DiscoInfo>((*i).second));
+            sendResponse(from, id, std::make_shared<DiscoInfo>((*i).second));
         }
         else {
             sendError(from, id, ErrorPayload::ItemNotFound, ErrorPayload::Cancel);
diff --git a/Swiften/Disco/DiscoInfoResponder.h b/Swiften/Disco/DiscoInfoResponder.h
index 0781173..9995695 100644
--- a/Swiften/Disco/DiscoInfoResponder.h
+++ b/Swiften/Disco/DiscoInfoResponder.h
@@ -24,7 +24,7 @@ namespace Swift {
             void setDiscoInfo(const std::string& node, const DiscoInfo& info);
 
         private:
-            virtual bool handleGetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<DiscoInfo> payload);
+            virtual bool handleGetRequest(const JID& from, const JID& to, const std::string& id, std::shared_ptr<DiscoInfo> payload);
 
         private:
             DiscoInfo info_;
diff --git a/Swiften/Disco/DiscoServiceWalker.cpp b/Swiften/Disco/DiscoServiceWalker.cpp
index 19170ce..761e6ab 100644
--- a/Swiften/Disco/DiscoServiceWalker.cpp
+++ b/Swiften/Disco/DiscoServiceWalker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -49,7 +49,7 @@ void DiscoServiceWalker::walkNode(const JID& jid) {
     discoInfoRequest->send();
 }
 
-void DiscoServiceWalker::handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, GetDiscoInfoRequest::ref request) {
+void DiscoServiceWalker::handleDiscoInfoResponse(std::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, GetDiscoInfoRequest::ref request) {
     /* If we got canceled, don't do anything */
     if (!active_) {
         return;
@@ -85,7 +85,7 @@ void DiscoServiceWalker::handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> in
     }
 }
 
-void DiscoServiceWalker::handleDiscoItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, GetDiscoItemsRequest::ref request) {
+void DiscoServiceWalker::handleDiscoItemsResponse(std::shared_ptr<DiscoItems> items, ErrorPayload::ref error, GetDiscoItemsRequest::ref request) {
     /* If we got canceled, don't do anything */
     if (!active_) {
         return;
diff --git a/Swiften/Disco/DiscoServiceWalker.h b/Swiften/Disco/DiscoServiceWalker.h
index bd8102b..43bd910 100644
--- a/Swiften/Disco/DiscoServiceWalker.h
+++ b/Swiften/Disco/DiscoServiceWalker.h
@@ -6,12 +6,11 @@
 
 #pragma once
 
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Disco/GetDiscoInfoRequest.h>
@@ -48,7 +47,7 @@ namespace Swift {
             }
 
             /** Emitted for each service found. */
-            boost::signal<void(const JID&, boost::shared_ptr<DiscoInfo>)> onServiceFound;
+            boost::signal<void(const JID&, std::shared_ptr<DiscoInfo>)> onServiceFound;
 
             /** Emitted when walking is aborted. */
             boost::signal<void()> onWalkAborted;
@@ -59,8 +58,8 @@ namespace Swift {
         private:
             void walkNode(const JID& jid);
             void markNodeCompleted(const JID& jid);
-            void handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, GetDiscoInfoRequest::ref request);
-            void handleDiscoItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, GetDiscoItemsRequest::ref request);
+            void handleDiscoInfoResponse(std::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, GetDiscoInfoRequest::ref request);
+            void handleDiscoItemsResponse(std::shared_ptr<DiscoItems> items, ErrorPayload::ref error, GetDiscoItemsRequest::ref request);
             void handleDiscoError(const JID& jid, ErrorPayload::ref error);
 
         private:
diff --git a/Swiften/Disco/EntityCapsManager.cpp b/Swiften/Disco/EntityCapsManager.cpp
index d30af54..64d90be 100644
--- a/Swiften/Disco/EntityCapsManager.cpp
+++ b/Swiften/Disco/EntityCapsManager.cpp
@@ -19,10 +19,10 @@ EntityCapsManager::EntityCapsManager(CapsProvider* capsProvider, StanzaChannel*
     capsProvider->onCapsAvailable.connect(boost::bind(&EntityCapsManager::handleCapsAvailable, this, _1));
 }
 
-void EntityCapsManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) {
+void EntityCapsManager::handlePresenceReceived(std::shared_ptr<Presence> presence) {
     JID from = presence->getFrom();
     if (presence->isAvailable()) {
-        boost::shared_ptr<CapsInfo> capsInfo = presence->getPayload<CapsInfo>();
+        std::shared_ptr<CapsInfo> capsInfo = presence->getPayload<CapsInfo>();
         if (!capsInfo || capsInfo->getHash() != "sha-1" || presence->getPayload<ErrorPayload>()) {
             return;
         }
diff --git a/Swiften/Disco/EntityCapsManager.h b/Swiften/Disco/EntityCapsManager.h
index 2a5d2d7..00b685b 100644
--- a/Swiften/Disco/EntityCapsManager.h
+++ b/Swiften/Disco/EntityCapsManager.h
@@ -35,7 +35,7 @@ namespace Swift {
             DiscoInfo::ref getCaps(const JID&) const;
 
         private:
-            void handlePresenceReceived(boost::shared_ptr<Presence>);
+            void handlePresenceReceived(std::shared_ptr<Presence>);
             void handleStanzaChannelAvailableChanged(bool);
             void handleCapsAvailable(const std::string&);
 
diff --git a/Swiften/Disco/FeatureOracle.cpp b/Swiften/Disco/FeatureOracle.cpp
index 1267cb0..8328984 100644
--- a/Swiften/Disco/FeatureOracle.cpp
+++ b/Swiften/Disco/FeatureOracle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -70,7 +70,7 @@ DiscoInfo::ref FeatureOracle::getDiscoResultForJID(const JID& jid) {
                 }
             }
         }
-        discoInfo = boost::make_shared<DiscoInfo>();
+        discoInfo = std::make_shared<DiscoInfo>();
 
         foreach(const std::string& commonFeature, commonFeatures) {
             discoInfo->addFeature(commonFeature);
diff --git a/Swiften/Disco/GetDiscoInfoRequest.h b/Swiften/Disco/GetDiscoInfoRequest.h
index ccbd3e2..1d86c14 100644
--- a/Swiften/Disco/GetDiscoInfoRequest.h
+++ b/Swiften/Disco/GetDiscoInfoRequest.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/DiscoInfo.h>
@@ -15,7 +15,7 @@
 namespace Swift {
     class SWIFTEN_API GetDiscoInfoRequest : public GenericRequest<DiscoInfo> {
         public:
-            typedef boost::shared_ptr<GetDiscoInfoRequest> ref;
+            typedef std::shared_ptr<GetDiscoInfoRequest> ref;
 
             static ref create(const JID& jid, IQRouter* router) {
                 return ref(new GetDiscoInfoRequest(jid, router));
@@ -27,11 +27,11 @@ namespace Swift {
 
         private:
             GetDiscoInfoRequest(const JID& jid, IQRouter* router) :
-                    GenericRequest<DiscoInfo>(IQ::Get, jid, boost::make_shared<DiscoInfo>(), router) {
+                    GenericRequest<DiscoInfo>(IQ::Get, jid, std::make_shared<DiscoInfo>(), router) {
             }
 
             GetDiscoInfoRequest(const JID& jid, const std::string& node, IQRouter* router) :
-                    GenericRequest<DiscoInfo>(IQ::Get, jid, boost::make_shared<DiscoInfo>(), router) {
+                    GenericRequest<DiscoInfo>(IQ::Get, jid, std::make_shared<DiscoInfo>(), router) {
                 getPayloadGeneric()->setNode(node);
             }
     };
diff --git a/Swiften/Disco/GetDiscoItemsRequest.h b/Swiften/Disco/GetDiscoItemsRequest.h
index 7f1adc6..5b1ccf2 100644
--- a/Swiften/Disco/GetDiscoItemsRequest.h
+++ b/Swiften/Disco/GetDiscoItemsRequest.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/DiscoItems.h>
@@ -15,7 +15,7 @@
 namespace Swift {
     class SWIFTEN_API GetDiscoItemsRequest : public GenericRequest<DiscoItems> {
         public:
-            typedef boost::shared_ptr<GetDiscoItemsRequest> ref;
+            typedef std::shared_ptr<GetDiscoItemsRequest> ref;
 
             static ref create(const JID& jid, IQRouter* router) {
                 return ref(new GetDiscoItemsRequest(jid, router));
@@ -27,11 +27,11 @@ namespace Swift {
 
         private:
             GetDiscoItemsRequest(const JID& jid, IQRouter* router) :
-                    GenericRequest<DiscoItems>(IQ::Get, jid, boost::make_shared<DiscoItems>(), router) {
+                    GenericRequest<DiscoItems>(IQ::Get, jid, std::make_shared<DiscoItems>(), router) {
             }
 
             GetDiscoItemsRequest(const JID& jid, const std::string& node, IQRouter* router) :
-                GenericRequest<DiscoItems>(IQ::Get, jid, boost::make_shared<DiscoItems>(), router) {
+                GenericRequest<DiscoItems>(IQ::Get, jid, std::make_shared<DiscoItems>(), router) {
                 getPayloadGeneric()->setNode(node);
             }
     };
diff --git a/Swiften/Disco/JIDDiscoInfoResponder.cpp b/Swiften/Disco/JIDDiscoInfoResponder.cpp
index 7bec992..8802bce 100644
--- a/Swiften/Disco/JIDDiscoInfoResponder.cpp
+++ b/Swiften/Disco/JIDDiscoInfoResponder.cpp
@@ -6,7 +6,7 @@
 
 #include <Swiften/Disco/JIDDiscoInfoResponder.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Queries/IQRouter.h>
@@ -32,16 +32,16 @@ void JIDDiscoInfoResponder::setDiscoInfo(const JID& jid, const std::string& node
     i->second.nodeDiscoInfo[node] = newInfo;
 }
 
-bool JIDDiscoInfoResponder::handleGetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<DiscoInfo> discoInfo) {
+bool JIDDiscoInfoResponder::handleGetRequest(const JID& from, const JID& to, const std::string& id, std::shared_ptr<DiscoInfo> discoInfo) {
     JIDDiscoInfoMap::const_iterator i = info.find(to);
     if (i != info.end()) {
         if (discoInfo->getNode().empty()) {
-            sendResponse(from, to, id, boost::make_shared<DiscoInfo>(i->second.discoInfo));
+            sendResponse(from, to, id, std::make_shared<DiscoInfo>(i->second.discoInfo));
         }
         else {
             std::map<std::string,DiscoInfo>::const_iterator j = i->second.nodeDiscoInfo.find(discoInfo->getNode());
             if (j != i->second.nodeDiscoInfo.end()) {
-                sendResponse(from, to, id, boost::make_shared<DiscoInfo>(j->second));
+                sendResponse(from, to, id, std::make_shared<DiscoInfo>(j->second));
             }
             else {
                 sendError(from, to, id, ErrorPayload::ItemNotFound, ErrorPayload::Cancel);
diff --git a/Swiften/Disco/JIDDiscoInfoResponder.h b/Swiften/Disco/JIDDiscoInfoResponder.h
index e2fbb5b7..1eb6228 100644
--- a/Swiften/Disco/JIDDiscoInfoResponder.h
+++ b/Swiften/Disco/JIDDiscoInfoResponder.h
@@ -25,7 +25,7 @@ namespace Swift {
             void setDiscoInfo(const JID& jid, const std::string& node, const DiscoInfo& info);
 
         private:
-            virtual bool handleGetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<DiscoInfo> payload);
+            virtual bool handleGetRequest(const JID& from, const JID& to, const std::string& id, std::shared_ptr<DiscoInfo> payload);
 
         private:
             struct JIDDiscoInfo {
diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
index 58c9531..8d27ec5 100644
--- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
@@ -22,7 +22,7 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+            crypto = std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
         }
 
         void testGenerate_XEP0115SimpleExample() {
@@ -51,24 +51,24 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
             discoInfo.addFeature("http://jabber.org/protocol/muc");
 
             Form::ref extension(new Form(Form::ResultType));
-            FormField::ref field = boost::make_shared<FormField>(FormField::HiddenType, "urn:xmpp:dataforms:softwareinfo");
+            FormField::ref field = std::make_shared<FormField>(FormField::HiddenType, "urn:xmpp:dataforms:softwareinfo");
             field->setName("FORM_TYPE");
             extension->addField(field);
-            field = boost::make_shared<FormField>(FormField::ListMultiType);
+            field = std::make_shared<FormField>(FormField::ListMultiType);
             field->addValue("ipv6");
             field->addValue("ipv4");
             field->setName("ip_version");
             extension->addField(field);
-            field = boost::make_shared<FormField>(FormField::TextSingleType, "Psi");
+            field = std::make_shared<FormField>(FormField::TextSingleType, "Psi");
             field->setName("software");
             extension->addField(field);
-            field = boost::make_shared<FormField>(FormField::TextSingleType, "0.11");
+            field = std::make_shared<FormField>(FormField::TextSingleType, "0.11");
             field->setName("software_version");
             extension->addField(field);
-            field = boost::make_shared<FormField>(FormField::TextSingleType, "Mac");
+            field = std::make_shared<FormField>(FormField::TextSingleType, "Mac");
             field->setName("os");
             extension->addField(field);
-            field = boost::make_shared<FormField>(FormField::TextSingleType, "10.5.1");
+            field = std::make_shared<FormField>(FormField::TextSingleType, "10.5.1");
             field->setName("os_version");
             extension->addField(field);
             discoInfo.addExtension(extension);
@@ -80,7 +80,7 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<CryptoProvider> crypto;
+        std::shared_ptr<CryptoProvider> crypto;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(CapsInfoGeneratorTest);
diff --git a/Swiften/Disco/UnitTest/CapsManagerTest.cpp b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
index fe7ee7e..ca727c2 100644
--- a/Swiften/Disco/UnitTest/CapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
@@ -45,21 +45,21 @@ class CapsManagerTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+            crypto = std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
             stanzaChannel = new DummyStanzaChannel();
             iqRouter = new IQRouter(stanzaChannel);
             storage = new CapsMemoryStorage();
             user1 = JID("user1@bar.com/bla");
-            discoInfo1 = boost::make_shared<DiscoInfo>();
+            discoInfo1 = std::make_shared<DiscoInfo>();
             discoInfo1->addFeature("http://swift.im/feature1");
-            capsInfo1 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
-            capsInfo1alt = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
+            capsInfo1 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
+            capsInfo1alt = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
             user2 = JID("user2@foo.com/baz");
-            discoInfo2 = boost::make_shared<DiscoInfo>();
+            discoInfo2 = std::make_shared<DiscoInfo>();
             discoInfo2->addFeature("http://swift.im/feature2");
-            capsInfo2 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo2.get()));
+            capsInfo2 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo2.get()));
             user3 = JID("user3@foo.com/baz");
-            legacyCapsInfo = boost::make_shared<CapsInfo>("http://swift.im", "ver1", "");
+            legacyCapsInfo = std::make_shared<CapsInfo>("http://swift.im", "ver1", "");
         }
 
         void tearDown() {
@@ -69,17 +69,17 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveNewHashRequestsDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
 
             CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<DiscoInfo>(0, user1, IQ::Get));
-            boost::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[0]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(discoInfo);
             CPPUNIT_ASSERT_EQUAL("http://node1.im#" + capsInfo1->getVersion(), discoInfo->getNode());
         }
 
         void testReceiveSameHashDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->sentStanzas.clear();
             sendPresenceWithCaps(user1, capsInfo1);
@@ -88,14 +88,14 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveLegacyCapsDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, legacyCapsInfo);
 
             CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(stanzaChannel->sentStanzas.size()));
         }
 
         void testReceiveSameHashAfterSuccesfulDiscoDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendDiscoInfoResult(discoInfo1);
 
@@ -106,7 +106,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSameHashFromSameUserAfterFailedDiscoDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -117,7 +117,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSameHashFromSameUserAfterIncorrectVerificationDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendDiscoInfoResult(discoInfo2);
 
@@ -128,7 +128,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSameHashFromDifferentUserAfterFailedDiscoRequestsDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -138,7 +138,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSameHashFromDifferentUserAfterIncorrectVerificationRequestsDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendDiscoInfoResult(discoInfo2);
 
@@ -148,7 +148,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveDifferentHashFromSameUserAfterFailedDiscoDoesNotRequestDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -159,50 +159,50 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSuccesfulDiscoStoresCaps() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendDiscoInfoResult(discoInfo1);
 
-            boost::shared_ptr<DiscoInfo> discoInfo(storage->getDiscoInfo(capsInfo1->getVersion()));
+            std::shared_ptr<DiscoInfo> discoInfo(storage->getDiscoInfo(capsInfo1->getVersion()));
             CPPUNIT_ASSERT(discoInfo);
             CPPUNIT_ASSERT(discoInfo->hasFeature("http://swift.im/feature1"));
         }
 
         void testReceiveIncorrectVerificationDiscoDoesNotStoreCaps() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendDiscoInfoResult(discoInfo2);
 
-            boost::shared_ptr<DiscoInfo> discoInfo(storage->getDiscoInfo(capsInfo1->getVersion()));
+            std::shared_ptr<DiscoInfo> discoInfo(storage->getDiscoInfo(capsInfo1->getVersion()));
             CPPUNIT_ASSERT(!discoInfo);
         }
 
         void testReceiveFailingDiscoFallsBack() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendPresenceWithCaps(user2, capsInfo1alt);
             stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
 
             CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<DiscoInfo>(1, user2, IQ::Get));
-            boost::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[1]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[1]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(discoInfo);
             CPPUNIT_ASSERT_EQUAL("http://node2.im#" + capsInfo1alt->getVersion(), discoInfo->getNode());
         }
 
         void testReceiveNoDiscoFallsBack() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendPresenceWithCaps(user2, capsInfo1alt);
-            stanzaChannel->onIQReceived(IQ::createResult(JID("baz@fum.com/dum"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID(), boost::shared_ptr<DiscoInfo>()));
+            stanzaChannel->onIQReceived(IQ::createResult(JID("baz@fum.com/dum"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID(), std::shared_ptr<DiscoInfo>()));
 
             CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<DiscoInfo>(1, user2, IQ::Get));
-            boost::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[1]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[1]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(discoInfo);
             CPPUNIT_ASSERT_EQUAL("http://node2.im#" + capsInfo1alt->getVersion(), discoInfo->getNode());
         }
 
         void testReceiveFailingFallbackDiscoFallsBack() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendPresenceWithCaps(user2, capsInfo1alt);
             sendPresenceWithCaps(user3, capsInfo1);
@@ -213,7 +213,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSameHashFromFailingUserAfterReconnectRequestsDisco() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
             stanzaChannel->setAvailable(false);
@@ -226,7 +226,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReconnectResetsFallback() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             sendPresenceWithCaps(user2, capsInfo1alt);
             stanzaChannel->setAvailable(false);
@@ -239,7 +239,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReconnectResetsRequests() {
-            boost::shared_ptr<CapsManager> testling = createManager();
+            std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
             stanzaChannel->sentStanzas.clear();
             stanzaChannel->setAvailable(false);
@@ -250,8 +250,8 @@ class CapsManagerTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<CapsManager> createManager() {
-            boost::shared_ptr<CapsManager> manager(new CapsManager(storage, stanzaChannel, iqRouter, crypto.get()));
+        std::shared_ptr<CapsManager> createManager() {
+            std::shared_ptr<CapsManager> manager(new CapsManager(storage, stanzaChannel, iqRouter, crypto.get()));
             manager->setWarnOnInvalidHash(false);
             //manager->onCapsChanged.connect(boost::bind(&CapsManagerTest::handleCapsChanged, this, _1));
             return manager;
@@ -261,14 +261,14 @@ class CapsManagerTest : public CppUnit::TestFixture {
             changes.push_back(jid);
         }
 
-        void sendPresenceWithCaps(const JID& jid, boost::shared_ptr<CapsInfo> caps) {
-            boost::shared_ptr<Presence> presence(new Presence());
+        void sendPresenceWithCaps(const JID& jid, std::shared_ptr<CapsInfo> caps) {
+            std::shared_ptr<Presence> presence(new Presence());
             presence->setFrom(jid);
             presence->addPayload(caps);
             stanzaChannel->onPresenceReceived(presence);
         }
 
-        void sendDiscoInfoResult(boost::shared_ptr<DiscoInfo> discoInfo) {
+        void sendDiscoInfoResult(std::shared_ptr<DiscoInfo> discoInfo) {
             stanzaChannel->onIQReceived(IQ::createResult(JID("baz@fum.com/dum"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID(), discoInfo));
         }
 
@@ -278,15 +278,15 @@ class CapsManagerTest : public CppUnit::TestFixture {
         CapsStorage* storage;
         std::vector<JID> changes;
         JID user1;
-        boost::shared_ptr<DiscoInfo> discoInfo1;
-        boost::shared_ptr<CapsInfo> capsInfo1;
-        boost::shared_ptr<CapsInfo> capsInfo1alt;
+        std::shared_ptr<DiscoInfo> discoInfo1;
+        std::shared_ptr<CapsInfo> capsInfo1;
+        std::shared_ptr<CapsInfo> capsInfo1alt;
         JID user2;
-        boost::shared_ptr<DiscoInfo> discoInfo2;
-        boost::shared_ptr<CapsInfo> capsInfo2;
-        boost::shared_ptr<CapsInfo> legacyCapsInfo;
+        std::shared_ptr<DiscoInfo> discoInfo2;
+        std::shared_ptr<CapsInfo> capsInfo2;
+        std::shared_ptr<CapsInfo> legacyCapsInfo;
         JID user3;
-        boost::shared_ptr<CryptoProvider> crypto;
+        std::shared_ptr<CryptoProvider> crypto;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(CapsManagerTest);
diff --git a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
index 907029e..45dc959 100644
--- a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
@@ -40,11 +40,11 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
             discoInfo.addFeature("foo");
             testling.setDiscoInfo(discoInfo);
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(payload);
             CPPUNIT_ASSERT_EQUAL(std::string(""), payload->getNode());
             CPPUNIT_ASSERT(payload->hasFeature("foo"));
@@ -62,12 +62,12 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
             discoInfoBar.addFeature("bar");
             testling.setDiscoInfo("bar-node", discoInfoBar);
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             query->setNode("bar-node");
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(payload);
             CPPUNIT_ASSERT_EQUAL(std::string("bar-node"), payload->getNode());
             CPPUNIT_ASSERT(payload->hasFeature("bar"));
@@ -77,13 +77,13 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
 
         void testHandleRequest_GetInvalidNodeInfo() {
             DiscoInfoResponder testling(router_);
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             query->setNode("bar-node");
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
             testling.start();
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
+            std::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
             CPPUNIT_ASSERT(payload);
 
             testling.stop();
diff --git a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
index 4062753..d775f6c 100644
--- a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
@@ -34,22 +34,22 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+            crypto = std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
 
             stanzaChannel = new DummyStanzaChannel();
             capsProvider = new DummyCapsProvider();
 
             user1 = JID("user1@bar.com/bla");
-            discoInfo1 = boost::make_shared<DiscoInfo>();
+            discoInfo1 = std::make_shared<DiscoInfo>();
             discoInfo1->addFeature("http://swift.im/feature1");
-            capsInfo1 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
-            capsInfo1alt = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
+            capsInfo1 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
+            capsInfo1alt = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
             user2 = JID("user2@foo.com/baz");
-            discoInfo2 = boost::make_shared<DiscoInfo>();
+            discoInfo2 = std::make_shared<DiscoInfo>();
             discoInfo2->addFeature("http://swift.im/feature2");
-            capsInfo2 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo2.get()));
+            capsInfo2 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo2.get()));
             user3 = JID("user3@foo.com/baz");
-            legacyCapsInfo = boost::make_shared<CapsInfo>("http://swift.im", "ver1", "");
+            legacyCapsInfo = std::make_shared<CapsInfo>("http://swift.im", "ver1", "");
         }
 
         void tearDown() {
@@ -58,7 +58,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveKnownHash() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
 
@@ -68,7 +68,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveKnownHashTwiceDoesNotTriggerChange() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
             changes.clear();
@@ -79,14 +79,14 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveUnknownHashDoesNotTriggerChange() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
 
             CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(changes.size()));
         }
 
         void testHashAvailable() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
 
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
@@ -98,7 +98,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveUnknownHashAfterKnownHashTriggersChangeAndClearsCaps() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
             changes.clear();
@@ -110,7 +110,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReceiveUnavailablePresenceAfterKnownHashTriggersChangeAndClearsCaps() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
             changes.clear();
@@ -122,7 +122,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
         void testReconnectTriggersChangeAndClearsCaps() {
-            boost::shared_ptr<EntityCapsManager> testling = createManager();
+            std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             capsProvider->caps[capsInfo2->getVersion()] = discoInfo2;
             sendPresenceWithCaps(user1, capsInfo1);
@@ -139,8 +139,8 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<EntityCapsManager> createManager() {
-            boost::shared_ptr<EntityCapsManager> manager(new EntityCapsManager(capsProvider, stanzaChannel));
+        std::shared_ptr<EntityCapsManager> createManager() {
+            std::shared_ptr<EntityCapsManager> manager(new EntityCapsManager(capsProvider, stanzaChannel));
             manager->onCapsChanged.connect(boost::bind(&EntityCapsManagerTest::handleCapsChanged, this, _1));
             return manager;
         }
@@ -149,15 +149,15 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
             changes.push_back(jid);
         }
 
-        void sendPresenceWithCaps(const JID& jid, boost::shared_ptr<CapsInfo> caps) {
-            boost::shared_ptr<Presence> presence(new Presence());
+        void sendPresenceWithCaps(const JID& jid, std::shared_ptr<CapsInfo> caps) {
+            std::shared_ptr<Presence> presence(new Presence());
             presence->setFrom(jid);
             presence->addPayload(caps);
             stanzaChannel->onPresenceReceived(presence);
         }
 
         void sendUnavailablePresence(const JID& jid) {
-            boost::shared_ptr<Presence> presence(new Presence());
+            std::shared_ptr<Presence> presence(new Presence());
             presence->setFrom(jid);
             presence->setType(Presence::Unavailable);
             stanzaChannel->onPresenceReceived(presence);
@@ -180,16 +180,16 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
         DummyStanzaChannel* stanzaChannel;
         DummyCapsProvider* capsProvider;
         JID user1;
-        boost::shared_ptr<DiscoInfo> discoInfo1;
-        boost::shared_ptr<CapsInfo> capsInfo1;
-        boost::shared_ptr<CapsInfo> capsInfo1alt;
+        std::shared_ptr<DiscoInfo> discoInfo1;
+        std::shared_ptr<CapsInfo> capsInfo1;
+        std::shared_ptr<CapsInfo> capsInfo1alt;
         JID user2;
-        boost::shared_ptr<DiscoInfo> discoInfo2;
-        boost::shared_ptr<CapsInfo> capsInfo2;
-        boost::shared_ptr<CapsInfo> legacyCapsInfo;
+        std::shared_ptr<DiscoInfo> discoInfo2;
+        std::shared_ptr<CapsInfo> capsInfo2;
+        std::shared_ptr<CapsInfo> legacyCapsInfo;
         JID user3;
         std::vector<JID> changes;
-        boost::shared_ptr<CryptoProvider> crypto;
+        std::shared_ptr<CryptoProvider> crypto;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(EntityCapsManagerTest);
diff --git a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
index 3c1a057..9369a04 100644
--- a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
@@ -41,11 +41,11 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
             discoInfo.addFeature("foo");
             testling.setDiscoInfo(JID("foo@bar.com/baz"), discoInfo);
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com/baz"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(payload);
             CPPUNIT_ASSERT_EQUAL(std::string(""), payload->getNode());
             CPPUNIT_ASSERT(payload->hasFeature("foo"));
@@ -63,12 +63,12 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
             discoInfoBar.addFeature("bar");
             testling.setDiscoInfo(JID("foo@bar.com/baz"), "bar-node", discoInfoBar);
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             query->setNode("bar-node");
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com/baz"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+            std::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(payload);
             CPPUNIT_ASSERT_EQUAL(std::string("bar-node"), payload->getNode());
             CPPUNIT_ASSERT(payload->hasFeature("bar"));
@@ -83,12 +83,12 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
             testling.setDiscoInfo(JID("foo@bar.com/baz"), discoInfo);
             testling.start();
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             query->setNode("bar-node");
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com/baz"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
+            std::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
             CPPUNIT_ASSERT(payload);
 
             testling.stop();
@@ -101,11 +101,11 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
             testling.setDiscoInfo(JID("foo@bar.com/baz"), discoInfo);
             testling.start();
 
-            boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+            std::shared_ptr<DiscoInfo> query(new DiscoInfo());
             channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com/fum"), "id-1", query));
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-            boost::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
+            std::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
             CPPUNIT_ASSERT(payload);
 
             testling.stop();