1 files changed, 39 insertions, 38 deletions
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h
index 095fe1f..e57730e 100644
--- a/Swiften/Disco/CapsManager.h
+++ b/Swiften/Disco/CapsManager.h
@@ -1,53 +1,54 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <set>
 #include <map>
+#include <set>
+
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Disco/CapsProvider.h>
 #include <Swiften/Elements/CapsInfo.h>
+#include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/Disco/CapsProvider.h>
+#include <Swiften/Elements/Presence.h>
 
 namespace Swift {
-	class StanzaChannel;
-	class IQRouter;
-	class JID;
-	class CapsStorage;
-	class CryptoProvider;
-
-	class SWIFTEN_API CapsManager : public CapsProvider, public boost::bsignals::trackable { 
-		public:
-			CapsManager(CapsStorage*, StanzaChannel*, IQRouter*, CryptoProvider*);
-
-			DiscoInfo::ref getCaps(const std::string&) const;
-
-			// Mainly for testing purposes
-			void setWarnOnInvalidHash(bool b) {
-				warnOnInvalidHash = b;
-			}
-
-		private:
-			void handlePresenceReceived(boost::shared_ptr<Presence>);
-			void handleStanzaChannelAvailableChanged(bool);
-			void handleDiscoInfoReceived(const JID&, const std::string& hash, DiscoInfo::ref, ErrorPayload::ref);
-			void requestDiscoInfo(const JID& jid, const std::string& node, const std::string& hash);
-
-		private:
-			IQRouter* iqRouter;
-			CryptoProvider* crypto;
-			CapsStorage* capsStorage;
-			bool warnOnInvalidHash;
-			std::set<std::string> requestedDiscoInfos;
-			std::set< std::pair<JID, std::string> > failingCaps;
-			std::map<std::string, std::set< std::pair<JID, std::string> > > fallbacks;
-	};
+    class StanzaChannel;
+    class IQRouter;
+    class JID;
+    class CapsStorage;
+    class CryptoProvider;
+
+    class SWIFTEN_API CapsManager : public CapsProvider, public boost::signals2::trackable {
+        public:
+            CapsManager(CapsStorage*, StanzaChannel*, IQRouter*, CryptoProvider*);
+
+            DiscoInfo::ref getCaps(const std::string&) const;
+
+            // Mainly for testing purposes
+            void setWarnOnInvalidHash(bool b) {
+                warnOnInvalidHash = b;
+            }
+
+        private:
+            void handlePresenceReceived(std::shared_ptr<Presence>);
+            void handleStanzaChannelAvailableChanged(bool);
+            void handleDiscoInfoReceived(const JID&, const std::string& hash, DiscoInfo::ref, ErrorPayload::ref);
+            void requestDiscoInfo(const JID& jid, const std::string& node, const std::string& hash);
+
+        private:
+            IQRouter* iqRouter;
+            CryptoProvider* crypto;
+            CapsStorage* capsStorage;
+            bool warnOnInvalidHash;
+            std::set<std::string> requestedDiscoInfos;
+            std::set< std::pair<JID, std::string> > failingCaps;
+            std::map<std::string, std::set< std::pair<JID, std::string> > > fallbacks;
+    };
 }