1 files changed, 20 insertions, 21 deletions
diff --git a/Swift/Controllers/XMPPEvents/EventController.h b/Swift/Controllers/XMPPEvents/EventController.h
index 35938ac..8a095d9 100644
--- a/Swift/Controllers/XMPPEvents/EventController.h
+++ b/Swift/Controllers/XMPPEvents/EventController.h
@@ -1,36 +1,35 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <memory>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/XMPPEvents/MessageEvent.h>
 #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
 
 namespace Swift {
-	typedef std::vector<boost::shared_ptr<StanzaEvent> > EventList;
-	class EventController {
-		public:
-			EventController();
-			~EventController();
-
-			void handleIncomingEvent(boost::shared_ptr<StanzaEvent> sourceEvent);
-			boost::signal<void (int)> onEventQueueLengthChange;
-			boost::signal<void (boost::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
-			const EventList& getEvents() const {return events_;}
-			void disconnectAll();
-			void clear();
-
-		private:
-			void handleEventConcluded(boost::shared_ptr<StanzaEvent> event);
-			EventList events_;
-	};
+    typedef std::vector<std::shared_ptr<StanzaEvent> > EventList;
+    class EventController {
+        public:
+            EventController();
+            ~EventController();
+
+            void handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEvent);
+            boost::signals2::signal<void (int)> onEventQueueLengthChange;
+            boost::signals2::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
+            const EventList& getEvents() const {return events_;}
+            void disconnectAll();
+            void clear();
+
+        private:
+            void handleEventConcluded(std::shared_ptr<StanzaEvent> event);
+            EventList events_;
+    };
 }