1 files changed, 34 insertions, 31 deletions
diff --git a/Swift/Controllers/EventNotifier.h b/Swift/Controllers/EventNotifier.h
index 4f7c430..b44615d 100644
--- a/Swift/Controllers/EventNotifier.h
+++ b/Swift/Controllers/EventNotifier.h
@@ -1,42 +1,45 @@
 /*
- * 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/Notifier/Notifier.h"
-#include "Swiften/Base/boost_bsignals.h"
-#include "Swift/Controllers/XMPPEvents/StanzaEvent.h"
-#include "Swiften/JID/JID.h"
+#include <boost/signals2.hpp>
+
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
+
+#include <SwifTools/Notifier/Notifier.h>
 
 namespace Swift {
-	class EventController;
-	class Notifier;
-	class AvatarManager;
-	class NickResolver;
-	class JID;
-	class UIEventStream;
-	class SettingsProvider;
-
-	class EventNotifier {
-		public:
-			EventNotifier(EventController* eventController, Notifier* notifier, AvatarManager* avatarManager, NickResolver* nickResolver);
-			~EventNotifier();
-
-			boost::signal<void (const JID&)> onNotificationActivated;
-
-		private:
-			void handleEventAdded(boost::shared_ptr<StanzaEvent>);
-			void handleNotificationActivated(JID jid);
-
-		private:
-			EventController* eventController;
-			Notifier* notifier;
-			AvatarManager* avatarManager;
-			NickResolver* nickResolver;
-	};
+    class EventController;
+    class Notifier;
+    class AvatarManager;
+    class NickResolver;
+    class JID;
+    class UIEventStream;
+    class SettingsProvider;
+
+    class EventNotifier {
+        public:
+            EventNotifier(EventController* eventController, Notifier* notifier, AvatarManager* avatarManager, NickResolver* nickResolver);
+            ~EventNotifier();
+
+            boost::signals2::signal<void (const JID&)> onNotificationActivated;
+
+        private:
+            void handleEventAdded(std::shared_ptr<StanzaEvent>);
+            void handleNotificationActivated(JID jid);
+
+        private:
+            EventController* eventController;
+            Notifier* notifier;
+            AvatarManager* avatarManager;
+            NickResolver* nickResolver;
+    };
 }