1 files changed, 34 insertions, 33 deletions
diff --git a/Swiften/Roster/XMPPRosterController.h b/Swiften/Roster/XMPPRosterController.h
index 603f350..f952c60 100644
--- a/Swiften/Roster/XMPPRosterController.h
+++ b/Swiften/Roster/XMPPRosterController.h
@@ -1,47 +1,48 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * 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 <string>
+
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/JID/JID.h>
-#include <string>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/Roster/RosterPushResponder.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
-	class IQRouter;
-	class XMPPRosterImpl;
-	class RosterStorage;
-
-	class SWIFTEN_API XMPPRosterController {
-		public:
-			XMPPRosterController(IQRouter *iqRouter, XMPPRosterImpl* xmppRoster, RosterStorage* storage);
-			~XMPPRosterController();
-
-			void requestRoster();
-
-			void setUseVersioning(bool b) {
-				useVersioning = b;
-			}
-
-		private:
-			void handleRosterReceived(boost::shared_ptr<RosterPayload> rosterPayload, bool initial, boost::shared_ptr<RosterPayload> previousRoster);
-			void saveRoster(const std::string& version);
-
-		private:
-			IQRouter* iqRouter_;
-			RosterPushResponder rosterPushResponder_;
-			XMPPRosterImpl* xmppRoster_;
-			RosterStorage* rosterStorage_;
-			bool useVersioning;
-	};
+    class IQRouter;
+    class XMPPRosterImpl;
+    class RosterStorage;
+
+    class SWIFTEN_API XMPPRosterController {
+        public:
+            XMPPRosterController(IQRouter *iqRouter, XMPPRosterImpl* xmppRoster, RosterStorage* storage);
+            ~XMPPRosterController();
+
+            void requestRoster();
+
+            void setUseVersioning(bool b) {
+                useVersioning = b;
+            }
+
+        private:
+            void handleRosterReceived(std::shared_ptr<RosterPayload> rosterPayload, bool initial, std::shared_ptr<RosterPayload> previousRoster);
+            void saveRoster(const std::string& version);
+
+        private:
+            IQRouter* iqRouter_;
+            RosterPushResponder rosterPushResponder_;
+            XMPPRosterImpl* xmppRoster_;
+            RosterStorage* rosterStorage_;
+            bool useVersioning;
+    };
 }