1 files changed, 33 insertions, 31 deletions
diff --git a/Swiften/Client/NickResolver.h b/Swiften/Client/NickResolver.h
index 306703e..a19c244 100644
--- a/Swiften/Client/NickResolver.h
+++ b/Swiften/Client/NickResolver.h
@@ -1,42 +1,44 @@
 /*
- * 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 <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/JID/JID.h>
 #include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
-	class XMPPRoster;
-	class MUCRegistry;
-	class VCardManager;
-
-	class SWIFTEN_API NickResolver {
-		public:
-			NickResolver(const JID& ownJID, XMPPRoster* xmppRoster, VCardManager* vcardManager, MUCRegistry* mucRegistry);
-
-			std::string jidToNick(const JID& jid);
-
-			boost::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged;
-
-		private:
-			void handleVCardReceived(const JID& jid, VCard::ref vCard);
-			void handleJIDUpdated(const JID& jid, const std::string& previousNick, const std::vector<std::string>& groups);
-			void handleJIDAdded(const JID& jid);
-
-		private:
-			JID ownJID_;
-			std::string ownNick_;
-			XMPPRoster* xmppRoster_;
-			MUCRegistry* mucRegistry_;
-			VCardManager* vcardManager_;
-	};
+    class XMPPRoster;
+    class MUCRegistry;
+    class VCardManager;
+
+    class SWIFTEN_API NickResolver {
+        public:
+            NickResolver(const JID& ownJID, XMPPRoster* xmppRoster, VCardManager* vcardManager, MUCRegistry* mucRegistry);
+
+            std::string jidToNick(const JID& jid);
+
+            boost::signals2::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged;
+
+        private:
+            void handleVCardReceived(const JID& jid, VCard::ref vCard);
+            void handleJIDUpdated(const JID& jid, const std::string& previousNick, const std::vector<std::string>& groups);
+            void handleJIDAdded(const JID& jid);
+
+        private:
+            JID ownJID_;
+            std::string ownNick_;
+            XMPPRoster* xmppRoster_;
+            MUCRegistry* mucRegistry_;
+            VCardManager* vcardManager_;
+    };
 }
-