4 files changed, 33 insertions, 32 deletions
diff --git a/Swift/Controllers/UnitTest/ContactSuggesterTest.cpp b/Swift/Controllers/UnitTest/ContactSuggesterTest.cpp
index 2bfca4b..217a2f0 100644
--- a/Swift/Controllers/UnitTest/ContactSuggesterTest.cpp
+++ b/Swift/Controllers/UnitTest/ContactSuggesterTest.cpp
@@ -4,9 +4,10 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
+
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -57,7 +58,7 @@ public:
         foreach (const std::string& name, words) {
             foreach (const std::string& jid, words) {
                 foreach (const StatusShow::Type& status, statuses) {
-                    contacts.push_back(boost::make_shared<Contact>(name, jid, status, ""));
+                    contacts.push_back(std::make_shared<Contact>(name, jid, status, ""));
                 }
             }
         }
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index e535eca..9a97994 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/foreach.h>
 
@@ -18,12 +18,12 @@ namespace Swift {
             MockChatWindow() : labelsEnabled_(false), impromptuMUCSupported_(false) {}
             virtual ~MockChatWindow();
 
-            virtual std::string addMessage(const ChatMessage& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/) {
+            virtual std::string addMessage(const ChatMessage& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, std::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/) {
                 lastMessageBody_ = bodyFromMessage(message);
                 return "id";
             }
 
-            virtual std::string addAction(const ChatMessage& /*message*/, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/) {return "id";}
+            virtual std::string addAction(const ChatMessage& /*message*/, const std::string& /*senderName*/, bool /*senderIsSelf*/, std::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/) {return "id";}
 
             virtual std::string addSystemMessage(const ChatMessage& message, Direction /*direction*/) {
                 lastAddedSystemMessage_ = message;
@@ -91,9 +91,9 @@ namespace Swift {
             virtual void setBookmarkState(RoomBookmarkState) {}
 
             static std::string bodyFromMessage(const ChatMessage& message) {
-                boost::shared_ptr<ChatTextMessagePart> text;
-                foreach (boost::shared_ptr<ChatMessagePart> part, message.getParts()) {
-                    if ((text = boost::dynamic_pointer_cast<ChatTextMessagePart>(part))) {
+                std::shared_ptr<ChatTextMessagePart> text;
+                foreach (std::shared_ptr<ChatMessagePart> part, message.getParts()) {
+                    if ((text = std::dynamic_pointer_cast<ChatTextMessagePart>(part))) {
                         return text->text;
                     }
                 }
diff --git a/Swift/Controllers/UnitTest/MockMainWindow.h b/Swift/Controllers/UnitTest/MockMainWindow.h
index 43522ce..6ae2aa7 100644
--- a/Swift/Controllers/UnitTest/MockMainWindow.h
+++ b/Swift/Controllers/UnitTest/MockMainWindow.h
@@ -20,7 +20,7 @@ namespace Swift {
             virtual void setMyAvatarPath(const std::string& /*path*/) {}
             virtual void setMyStatusText(const std::string& /*status*/) {}
             virtual void setMyStatusType(StatusShow::Type /*type*/) {}
-            virtual void setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> /*contact*/) {}
+            virtual void setMyContactRosterItem(std::shared_ptr<ContactRosterItem> /*contact*/) {}
             virtual void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& /*commands*/) {}
             virtual void setConnecting() {}
             virtual void setStreamEncryptionStatus(bool /*tlsInPlaceAndValid*/) {}
diff --git a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
index b3b364f..1375475 100644
--- a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
+++ b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
@@ -74,7 +74,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveFirstPresenceCreatesAvailableNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendPresence(user1, StatusShow::Online);
 
@@ -83,7 +83,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveSecondPresenceCreatesStatusChangeNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             sendPresence(user1, StatusShow::Away);
             notifier->notifications.clear();
 
@@ -94,7 +94,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveUnavailablePresenceAfterAvailablePresenceCreatesUnavailableNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             sendPresence(user1, StatusShow::Away);
             notifier->notifications.clear();
 
@@ -105,7 +105,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveUnavailablePresenceWithoutAvailableDoesNotCreateNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendUnavailablePresence(user1);
 
@@ -113,7 +113,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveAvailablePresenceAfterUnavailableCreatesAvailableNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             sendPresence(user1, StatusShow::Away);
             sendUnavailablePresence(user1);
             notifier->notifications.clear();
@@ -125,7 +125,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveAvailablePresenceAfterReconnectCreatesAvailableNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             sendPresence(user1, StatusShow::Away);
             stanzaChannel->setAvailable(false);
             stanzaChannel->setAvailable(true);
@@ -138,7 +138,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveAvailablePresenceFromMUCDoesNotCreateNotification() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             mucRegistry->addMUC(JID("teaparty@wonderland.lit"));
 
             sendPresence(JID("teaparty@wonderland.lit/Alice"), StatusShow::Away);
@@ -147,7 +147,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationPicture() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             avatarManager->avatars[user1] = createByteArray("abcdef");
 
             sendPresence(user1, StatusShow::Online);
@@ -157,7 +157,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationActivationEmitsSignal() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendPresence(user1, StatusShow::Online);
             CPPUNIT_ASSERT(notifier->notifications[0].callback);
@@ -168,7 +168,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationSubjectContainsNameForJIDInRoster() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             roster->addContact(user1.toBare(), "User 1", std::vector<std::string>(), RosterItemPayload::Both);
 
             sendPresence(user1, StatusShow::Online);
@@ -179,7 +179,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationSubjectContainsJIDForJIDNotInRoster() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendPresence(user1, StatusShow::Online);
 
@@ -189,7 +189,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationSubjectContainsStatus() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendPresence(user1, StatusShow::Away);
 
@@ -199,7 +199,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testNotificationMessageContainsStatusMessage() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
 
             sendPresence(user1, StatusShow::Away);
 
@@ -208,7 +208,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveFirstPresenceWithQuietPeriodDoesNotNotify() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
 
             sendPresence(user1, StatusShow::Online);
@@ -217,7 +217,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceivePresenceDuringQuietPeriodDoesNotNotify() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
 
             sendPresence(user1, StatusShow::Online);
@@ -228,7 +228,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceivePresenceDuringQuietPeriodResetsTimer() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
 
             sendPresence(user1, StatusShow::Online);
@@ -241,7 +241,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceivePresenceAfterQuietPeriodNotifies() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
 
             sendPresence(user1, StatusShow::Online);
@@ -252,7 +252,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveFirstPresenceWithQuietPeriodDoesNotCountAsQuietPeriod() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
 
             timerFactory->setTime(11);
@@ -262,7 +262,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void testReceiveFirstPresenceAfterReconnectWithQuietPeriodDoesNotNotify() {
-            boost::shared_ptr<PresenceNotifier> testling = createNotifier();
+            std::shared_ptr<PresenceNotifier> testling = createNotifier();
             testling->setInitialQuietPeriodMS(10);
             sendPresence(user1, StatusShow::Online);
             timerFactory->setTime(15);
@@ -279,15 +279,15 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
 
 
     private:
-        boost::shared_ptr<PresenceNotifier> createNotifier() {
-            boost::shared_ptr<PresenceNotifier> result(new PresenceNotifier(stanzaChannel, notifier, mucRegistry, avatarManager, nickResolver, presenceOracle, timerFactory));
+        std::shared_ptr<PresenceNotifier> createNotifier() {
+            std::shared_ptr<PresenceNotifier> result(new PresenceNotifier(stanzaChannel, notifier, mucRegistry, avatarManager, nickResolver, presenceOracle, timerFactory));
             result->onNotificationActivated.connect(boost::bind(&PresenceNotifierTest::handleNotificationActivated, this, _1));
             result->setInitialQuietPeriodMS(0);
             return result;
         }
 
         void sendPresence(const JID& jid, StatusShow::Type type) {
-            boost::shared_ptr<Presence> presence(new Presence());
+            std::shared_ptr<Presence> presence(new Presence());
             presence->setFrom(jid);
             presence->setShow(type);
             presence->setStatus("Status Message");
@@ -295,7 +295,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
         }
 
         void sendUnavailablePresence(const JID& jid) {
-            boost::shared_ptr<Presence> presence(new Presence());
+            std::shared_ptr<Presence> presence(new Presence());
             presence->setType(Presence::Unavailable);
             presence->setFrom(jid);
             stanzaChannel->onPresenceReceived(presence);