9 files changed, 26 insertions, 26 deletions
diff --git a/SwifTools/CrashReporter.cpp b/SwifTools/CrashReporter.cpp
index b401e76..15b5cd0 100644
--- a/SwifTools/CrashReporter.cpp
+++ b/SwifTools/CrashReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -13,7 +13,7 @@
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #ifdef SWIFTEN_PLATFORM_MACOSX
 #include "client/mac/handler/exception_handler.h"
@@ -35,7 +35,7 @@ static bool handleDump(const char* /* dir */, const char* /* id*/, void* /* cont
 namespace Swift {
 
 struct CrashReporter::Private {
-    boost::shared_ptr<google_breakpad::ExceptionHandler> handler;
+    std::shared_ptr<google_breakpad::ExceptionHandler> handler;
 };
 
 CrashReporter::CrashReporter(const boost::filesystem::path& path) {
@@ -49,11 +49,11 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path) {
         }
     }
 
-    p = boost::make_shared<Private>();
+    p = std::make_shared<Private>();
 #if defined(SWIFTEN_PLATFORM_WINDOWS)
     // FIXME: Need UTF8 conversion from string to wstring
     std::string pathString = pathToString(path);
-    p->handler = boost::shared_ptr<google_breakpad::ExceptionHandler>(
+    p->handler = std::shared_ptr<google_breakpad::ExceptionHandler>(
             // Not using make_shared, because 'handleDump' seems to have problems with VC2010
             new google_breakpad::ExceptionHandler(
                 std::wstring(pathString.begin(), pathString.end()),
@@ -63,7 +63,7 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path) {
                 google_breakpad::ExceptionHandler::HANDLER_ALL));
 // Turning it off for Mac, because it doesn't really help us
 //#elif defined(SWIFTEN_PLATFORM_MACOSX)
-//    p->handler = boost::make_shared<google_breakpad::ExceptionHandler>(pathToString(path), (google_breakpad::ExceptionHandler::FilterCallback) 0, handleDump, (void*) 0, true, (const char*) 0);
+//    p->handler = std::make_shared<google_breakpad::ExceptionHandler>(pathToString(path), (google_breakpad::ExceptionHandler::FilterCallback) 0, handleDump, (void*) 0, true, (const char*) 0);
 #endif
 }
 
diff --git a/SwifTools/CrashReporter.h b/SwifTools/CrashReporter.h
index ee71223..c80b1a2 100644
--- a/SwifTools/CrashReporter.h
+++ b/SwifTools/CrashReporter.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
 
 namespace Swift {
     class CrashReporter {
@@ -18,6 +18,6 @@ namespace Swift {
 
         private:
             struct Private;
-            boost::shared_ptr<Private> p;
+            std::shared_ptr<Private> p;
     };
 }
diff --git a/SwifTools/Idle/ActualIdleDetector.h b/SwifTools/Idle/ActualIdleDetector.h
index 194606f..44a9649 100644
--- a/SwifTools/Idle/ActualIdleDetector.h
+++ b/SwifTools/Idle/ActualIdleDetector.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <SwifTools/Idle/IdleDetector.h>
 
@@ -25,6 +25,6 @@ namespace Swift {
 
         private:
             IdleQuerier* querier;
-            boost::shared_ptr<Timer> timer;
+            std::shared_ptr<Timer> timer;
     };
 }
diff --git a/SwifTools/Idle/IdleDetector.h b/SwifTools/Idle/IdleDetector.h
index 88a1c4c..30276bc 100644
--- a/SwifTools/Idle/IdleDetector.h
+++ b/SwifTools/Idle/IdleDetector.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/boost_bsignals.h>
 
diff --git a/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp b/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
index 8af66fc..8e4177e 100644
--- a/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
+++ b/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
@@ -150,18 +150,18 @@ class ActualIdleDetectorTest : public CppUnit::TestFixture {
             MockTimerFactory() {}
 
             void updateTime(int milliseconds) {
-                foreach(boost::shared_ptr<MockTimer> timer, timers) {
+                foreach(std::shared_ptr<MockTimer> timer, timers) {
                     timer->updateTime(milliseconds);
                 }
             }
 
-            boost::shared_ptr<Timer> createTimer(int milliseconds) {
-                boost::shared_ptr<MockTimer> timer(new MockTimer(milliseconds));
+            std::shared_ptr<Timer> createTimer(int milliseconds) {
+                std::shared_ptr<MockTimer> timer(new MockTimer(milliseconds));
                 timers.push_back(timer);
                 return timer;
             }
 
-            std::vector<boost::shared_ptr<MockTimer> > timers;
+            std::vector<std::shared_ptr<MockTimer> > timers;
         };
 
         MockIdleQuerier* querier;
diff --git a/SwifTools/Notifier/GrowlNotifier.h b/SwifTools/Notifier/GrowlNotifier.h
index b4c4eba..cbfe3e9 100644
--- a/SwifTools/Notifier/GrowlNotifier.h
+++ b/SwifTools/Notifier/GrowlNotifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -36,6 +36,6 @@ namespace Swift {
 
         private:
             class Private;
-            boost::shared_ptr<Private> p;
+            std::shared_ptr<Private> p;
     };
 }
diff --git a/SwifTools/Notifier/GrowlNotifier.mm b/SwifTools/Notifier/GrowlNotifier.mm
index e9ffff7..1356805 100644
--- a/SwifTools/Notifier/GrowlNotifier.mm
+++ b/SwifTools/Notifier/GrowlNotifier.mm
@@ -6,7 +6,7 @@
 
 #include <SwifTools/Notifier/GrowlNotifier.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 #include <set>
 
 #include <SwifTools/Notifier/GrowlNotifierDelegate.h>
@@ -33,7 +33,7 @@ class GrowlNotifier::Private {
 };
 
 GrowlNotifier::GrowlNotifier(const std::string& name) {
-    p = boost::make_shared<Private>();
+    p = std::make_shared<Private>();
     p->delegate = boost::intrusive_ptr<GrowlNotifierDelegate>([[GrowlNotifierDelegate alloc] init], false);
     p->delegate.get().notifier = this;
     p->delegate.get().name = std2NSString(name);
diff --git a/SwifTools/Notifier/NotificationCenterNotifier.h b/SwifTools/Notifier/NotificationCenterNotifier.h
index 75b4df7..19eb944 100644
--- a/SwifTools/Notifier/NotificationCenterNotifier.h
+++ b/SwifTools/Notifier/NotificationCenterNotifier.h
@@ -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.
  */
@@ -32,7 +32,7 @@ public:
 
 private:
     class Private;
-    boost::shared_ptr<Private> p;
+    std::shared_ptr<Private> p;
 };
 
 }
diff --git a/SwifTools/Notifier/NotificationCenterNotifier.mm b/SwifTools/Notifier/NotificationCenterNotifier.mm
index 57b9a4b..35c740a 100644
--- a/SwifTools/Notifier/NotificationCenterNotifier.mm
+++ b/SwifTools/Notifier/NotificationCenterNotifier.mm
@@ -9,7 +9,7 @@
 #include <map>
 #include <string>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/Log.h>
 
@@ -35,12 +35,12 @@ namespace Swift {
 
 class NotificationCenterNotifier::Private {
     public:
-        std::map<std::string, boost::shared_ptr<Context> > callbacksForNotifications;
+        std::map<std::string, std::shared_ptr<Context> > callbacksForNotifications;
         boost::intrusive_ptr<NotificationCenterNotifierDelegate> delegate;
 };
 
 NotificationCenterNotifier::NotificationCenterNotifier() {
-    p = boost::make_shared<Private>();
+    p = std::make_shared<Private>();
     p->delegate = boost::intrusive_ptr<NotificationCenterNotifierDelegate>([[NotificationCenterNotifierDelegate alloc] init], false);
     [p->delegate.get() setNotifier: this];
 
@@ -73,7 +73,7 @@ void NotificationCenterNotifier::showMessage(Type type, const std::string& subje
     /// \todo Currently the elements are only removed on application exit. Ideally the notifications not required anymore
     ///       are removed from the map; e.g. when visiting a chat view, all notifications from that view can be removed from
     ///       the map and the NSUserNotificationCenter.
-    p->callbacksForNotifications[ns2StdString(notification.identifier)] = boost::make_shared<Context>(callback);
+    p->callbacksForNotifications[ns2StdString(notification.identifier)] = std::make_shared<Context>(callback);
     [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
     [notification release];
 }