1 files changed, 47 insertions, 46 deletions
diff --git a/Swift/Controllers/HighlightManager.h b/Swift/Controllers/HighlightManager.h
index c55990b..a35e253 100644
--- a/Swift/Controllers/HighlightManager.h
+++ b/Swift/Controllers/HighlightManager.h
@@ -5,76 +5,77 @@
  */
 
 /*
- * Copyright (c) 2014-2015 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
+
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swift/Controllers/HighlightRule.h>
 
 namespace Swift {
 
-	class SettingsProvider;
-	class Highlighter;
+    class SettingsProvider;
+    class Highlighter;
 
-	class HighlightManager {
-		public:
+    class HighlightManager {
+        public:
 
-			class HighlightRulesList {
-			public:
-				friend class HighlightManager;
-				size_t getSize() const { return list_.size(); }
-				const HighlightRule& getRule(const size_t index) const { return list_[index]; }
-				void addRule(const HighlightRule& rule) { list_.push_back(rule); }
-				void combineRules(const HighlightRulesList& rhs) {
-					list_.insert(list_.end(), rhs.list_.begin(), rhs.list_.end());
-				}
-				void setRule(const size_t index, const HighlightRule& rule) {
-					list_[index] = rule;
-				}
-			private:
-				std::vector<HighlightRule> list_;
-			};
+            class HighlightRulesList {
+            public:
+                friend class HighlightManager;
+                size_t getSize() const { return list_.size(); }
+                const HighlightRule& getRule(const size_t index) const { return list_[index]; }
+                void addRule(const HighlightRule& rule) { list_.push_back(rule); }
+                void combineRules(const HighlightRulesList& rhs) {
+                    list_.insert(list_.end(), rhs.list_.begin(), rhs.list_.end());
+                }
+                void setRule(const size_t index, const HighlightRule& rule) {
+                    list_[index] = rule;
+                }
+            private:
+                std::vector<HighlightRule> list_;
+            };
 
-			HighlightManager(SettingsProvider* settings);
+            HighlightManager(SettingsProvider* settings);
 
-			Highlighter* createHighlighter();
+            Highlighter* createHighlighter();
 
-			boost::shared_ptr<const HighlightManager::HighlightRulesList> getRules() const { return rules_; }
+            std::shared_ptr<const HighlightManager::HighlightRulesList> getRules() const { return rules_; }
 
-			bool isDefaultRulesList() const;
-			void resetToDefaultRulesList();
+            bool isDefaultRulesList() const;
+            void resetToDefaultRulesList();
 
-			HighlightRule getRule(int index) const;
-			void setRule(int index, const HighlightRule& rule);
-			void insertRule(int index, const HighlightRule& rule);
-			void removeRule(int index);
-			void swapRules(const size_t first, const size_t second);
-			void storeSettings();
-			void loadSettings();
+            HighlightRule getRule(int index) const;
+            void setRule(int index, const HighlightRule& rule);
+            void insertRule(int index, const HighlightRule& rule);
+            void removeRule(int index);
+            void swapRules(const size_t first, const size_t second);
+            void storeSettings();
+            void loadSettings();
 
-			boost::signal<void (const HighlightAction&)> onHighlight;
+            boost::signals2::signal<void (const HighlightAction&)> onHighlight;
 
-		private:
-			void handleSettingChanged(const std::string& settingPath);
+        private:
+            void handleSettingChanged(const std::string& settingPath);
 
-			std::string rulesToString() const;
-			static std::vector<HighlightRule> getDefaultRules();
+            std::string rulesToString() const;
+            static std::vector<HighlightRule> getDefaultRules();
 
-		private:
-			SettingsProvider* settings_;
-			bool storingSettings_;
+        private:
+            SettingsProvider* settings_;
+            bool storingSettings_;
 
-			boost::shared_ptr<HighlightManager::HighlightRulesList> rules_;
-			boost::bsignals::scoped_connection handleSettingChangedConnection_;
-	};
+            std::shared_ptr<HighlightManager::HighlightRulesList> rules_;
+            boost::signals2::scoped_connection handleSettingChangedConnection_;
+    };
 
-	typedef boost::shared_ptr<const HighlightManager::HighlightRulesList> HighlightRulesListPtr;
+    typedef std::shared_ptr<const HighlightManager::HighlightRulesList> HighlightRulesListPtr;
 
 }