1 files changed, 8 insertions, 7 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.h b/Swift/Controllers/Chat/UserSearchController.h
index fc4c8e9..d630580 100644
--- a/Swift/Controllers/Chat/UserSearchController.h
+++ b/Swift/Controllers/Chat/UserSearchController.h
@@ -1,44 +1,45 @@
 /*
  * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
+
 #include <map>
 #include <vector>
-#include <Swiften/Base/boost_bsignals.h>
-
-#include <Swiften/Elements/SearchPayload.h>
 #include <string>
-#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/Contact.h>
+#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/Elements/VCard.h>
 #include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/SearchPayload.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
 	class UIEventStream;
 	class UIEvent;
 	class UserSearchWindow;
 	class UserSearchWindowFactory;
 	class IQRouter;
 	class DiscoServiceWalker;
 	class RosterController;
 	class VCardManager;
 	class ContactSuggester;
 	class AvatarManager;
 	class PresenceOracle;
-	class Contact;
 
 	class UserSearchResult {
 		public:
 			UserSearchResult(const JID& jid, const std::map<std::string, std::string>& fields) : jid_(jid), fields_(fields) {}
 			const JID& getJID() const {return jid_;}
 			const std::map<std::string, std::string>& getFields() const {return fields_;}
 		private:
 			JID jid_;
 			std::map<std::string, std::string> fields_;
@@ -62,19 +63,19 @@ namespace Swift {
 			void handleSearch(boost::shared_ptr<SearchPayload> fields, const JID& jid);
 			void handleSearchResponse(boost::shared_ptr<SearchPayload> results, ErrorPayload::ref error);
 			void handleNameSuggestionRequest(const JID& jid);
 			void handleContactSuggestionsRequested(std::string text);
 			void handleVCardChanged(const JID& jid, VCard::ref vcard);
 			void handleAvatarChanged(const JID& jid);
 			void handlePresenceChanged(Presence::ref presence);
 			void handleJIDUpdateRequested(const std::vector<JID>& jids);
 			void handleJIDAddRequested(const std::vector<JID>& jids);
-			Contact convertJIDtoContact(const JID& jid);
+			Contact::ref convertJIDtoContact(const JID& jid);
 			void endDiscoWalker();
 			void initializeUserWindow();
 
 		private:
 			Type type_;
 			JID jid_;
 			JID suggestionsJID_;
 			UIEventStream* uiEventStream_;
 			VCardManager* vcardManager_;