1 files changed, 26 insertions, 24 deletions
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index 7a11577..56202b4 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -1,37 +1,39 @@
 /*
- * 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 <memory>
+
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
-#include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include <Swiften/Base/SafeByteArray.h>
 
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+
 namespace Swift {
-	
-	class XMLConsoleWidgetFactory;
-	class XMLConsoleWidget;
-
-	class XMLConsoleController {
-		public:
-			XMLConsoleController(UIEventStream* uiEventStream, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory);
-			~XMLConsoleController();
-
-		public:
-			void handleDataRead(const SafeByteArray& data);
-			void handleDataWritten(const SafeByteArray& data);
-
-		private:
-			void handleUIEvent(boost::shared_ptr<UIEvent> event);
-
-		private:
-			XMLConsoleWidgetFactory* xmlConsoleWidgetFactory;
-			XMLConsoleWidget* xmlConsoleWidget;
-	};
+
+    class XMLConsoleWidgetFactory;
+    class XMLConsoleWidget;
+
+    class XMLConsoleController {
+        public:
+            XMLConsoleController(UIEventStream* uiEventStream, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory);
+            ~XMLConsoleController();
+
+        public:
+            void handleDataRead(const SafeByteArray& data);
+            void handleDataWritten(const SafeByteArray& data);
+
+        private:
+            void handleUIEvent(std::shared_ptr<UIEvent> event);
+
+        private:
+            XMLConsoleWidgetFactory* xmlConsoleWidgetFactory;
+            XMLConsoleWidget* xmlConsoleWidget;
+    };
 }