1 files changed, 16 insertions, 15 deletions
diff --git a/Swiften/Chat/ChatStateTracker.h b/Swiften/Chat/ChatStateTracker.h
index 01e7155..c903e3a 100644
--- a/Swiften/Chat/ChatStateTracker.h
+++ b/Swiften/Chat/ChatStateTracker.h
@@ -1,28 +1,29 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <boost/shared_ptr.hpp>
-#include <Swiften/Base/API.h>
+#include <memory>
+
+#include <boost/signals2.hpp>
 
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/ChatState.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/ChatState.h>
 
 namespace Swift {
-	class SWIFTEN_API ChatStateTracker {
-		public:
-			ChatStateTracker();
-			void handleMessageReceived(boost::shared_ptr<Message> message);
-			void handlePresenceChange(boost::shared_ptr<Presence> newPresence);
-			boost::signal<void (ChatState::ChatStateType)> onChatStateChange;
-		private:
-			void changeState(ChatState::ChatStateType state);
-			ChatState::ChatStateType currentState_;
-	};
+    class SWIFTEN_API ChatStateTracker {
+        public:
+            ChatStateTracker();
+            void handleMessageReceived(std::shared_ptr<Message> message);
+            void handlePresenceChange(std::shared_ptr<Presence> newPresence);
+            boost::signals2::signal<void (ChatState::ChatStateType)> onChatStateChange;
+        private:
+            void changeState(ChatState::ChatStateType state);
+            ChatState::ChatStateType currentState_;
+    };
 }