5 files changed, 19 insertions, 18 deletions
diff --git a/Swiften/Chat/ChatStateNotifier.cpp b/Swiften/Chat/ChatStateNotifier.cpp
index c623ce1..cbb9b0b 100644
--- a/Swiften/Chat/ChatStateNotifier.cpp
+++ b/Swiften/Chat/ChatStateNotifier.cpp
@@ -6,8 +6,9 @@
 
 #include <Swiften/Chat/ChatStateNotifier.h>
 
+#include <memory>
+
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Disco/EntityCapsProvider.h>
@@ -69,15 +70,15 @@ bool ChatStateNotifier::contactShouldReceiveStates() {
 }
 
 void ChatStateNotifier::changeState(ChatState::ChatStateType state) {
-    boost::shared_ptr<Message> message(boost::make_shared<Message>());
+    std::shared_ptr<Message> message(std::make_shared<Message>());
     message->setTo(contact_);
-    message->addPayload(boost::make_shared<ChatState>(state));
+    message->addPayload(std::make_shared<ChatState>(state));
     stanzaChannel_->sendMessage(message);
 }
 
 void ChatStateNotifier::addChatStateRequest(Message::ref message) {
     if (contactShouldReceiveStates()) {
-        message->addPayload(boost::make_shared<ChatState>(ChatState::Active));
+        message->addPayload(std::make_shared<ChatState>(ChatState::Active));
     }
 }
 
diff --git a/Swiften/Chat/ChatStateNotifier.h b/Swiften/Chat/ChatStateNotifier.h
index a53fad8..a8cc86a 100644
--- a/Swiften/Chat/ChatStateNotifier.h
+++ b/Swiften/Chat/ChatStateNotifier.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>
diff --git a/Swiften/Chat/ChatStateTracker.cpp b/Swiften/Chat/ChatStateTracker.cpp
index 5141872..25ecd1c 100644
--- a/Swiften/Chat/ChatStateTracker.cpp
+++ b/Swiften/Chat/ChatStateTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,17 +11,17 @@ ChatStateTracker::ChatStateTracker() {
     currentState_ = ChatState::Gone;
 }
 
-void ChatStateTracker::handleMessageReceived(boost::shared_ptr<Message> message) {
+void ChatStateTracker::handleMessageReceived(std::shared_ptr<Message> message) {
     if (message->getType() == Message::Error) {
         return;
     }
-    boost::shared_ptr<ChatState> statePayload = message->getPayload<ChatState>();
+    std::shared_ptr<ChatState> statePayload = message->getPayload<ChatState>();
     if (statePayload) {
         changeState(statePayload->getChatState());;
     }
 }
 
-void ChatStateTracker::handlePresenceChange(boost::shared_ptr<Presence> newPresence) {
+void ChatStateTracker::handlePresenceChange(std::shared_ptr<Presence> newPresence) {
     if (newPresence->getType() == Presence::Unavailable) {
         onChatStateChange(ChatState::Gone);
     }
diff --git a/Swiften/Chat/ChatStateTracker.h b/Swiften/Chat/ChatStateTracker.h
index f31da0b..5bbc7ec 100644
--- a/Swiften/Chat/ChatStateTracker.h
+++ b/Swiften/Chat/ChatStateTracker.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>
@@ -18,8 +18,8 @@ namespace Swift {
     class SWIFTEN_API ChatStateTracker {
         public:
             ChatStateTracker();
-            void handleMessageReceived(boost::shared_ptr<Message> message);
-            void handlePresenceChange(boost::shared_ptr<Presence> newPresence);
+            void handleMessageReceived(std::shared_ptr<Message> message);
+            void handlePresenceChange(std::shared_ptr<Presence> newPresence);
             boost::signal<void (ChatState::ChatStateType)> onChatStateChange;
         private:
             void changeState(ChatState::ChatStateType state);
diff --git a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
index af43ced..278068a 100644
--- a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
+++ b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
@@ -70,21 +70,21 @@ public:
 
     void testContactShouldReceiveStates_CapsOnly() {
         setContactHas85Caps();
-        boost::shared_ptr<Message> message(new Message());
+        std::shared_ptr<Message> message(new Message());
         notifier_->addChatStateRequest(message);
         CPPUNIT_ASSERT(message->getPayload<ChatState>());
         CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
     }
 
     void testContactShouldReceiveStates_CapsNorActive() {
-        boost::shared_ptr<Message> message(new Message());
+        std::shared_ptr<Message> message(new Message());
         notifier_->addChatStateRequest(message);
         CPPUNIT_ASSERT(!message->getPayload<ChatState>());
     }
 
     void testContactShouldReceiveStates_ActiveOverrideOn() {
         notifier_->receivedMessageFromContact(true);
-        boost::shared_ptr<Message> message(new Message());
+        std::shared_ptr<Message> message(new Message());
         notifier_->addChatStateRequest(message);
         CPPUNIT_ASSERT(message->getPayload<ChatState>());
         CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
@@ -97,7 +97,7 @@ public:
          * thought this should check for false, but I later found it was OPTIONAL
          * (MAY) behaviour only for if you didn't receive caps.
          */
-        boost::shared_ptr<Message> message(new Message());
+        std::shared_ptr<Message> message(new Message());
         notifier_->addChatStateRequest(message);
         CPPUNIT_ASSERT(message->getPayload<ChatState>());
         CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
@@ -142,7 +142,7 @@ public:
 
         int getComposingCount() const {
             int result = 0;
-            foreach(boost::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+            foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
                 if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Composing) {
                     result++;
                 }
@@ -152,7 +152,7 @@ public:
 
         int getActiveCount() const {
             int result = 0;
-            foreach(boost::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+            foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
                 if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Active) {
                     result++;
                 }