1 files changed, 90 insertions, 79 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index e5a9f80..f67712e 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -1,98 +1,109 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <QWizard>
 #include <set>
 
-#include <Swift/QtUI/UserSearch/ui_QtUserSearchWizard.h>
+#include <QAbstractItemModel>
+#include <QWizard>
+
 #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h>
 
+#include <Swift/QtUI/UserSearch/ui_QtUserSearchWizard.h>
+
 namespace Swift {
-	class UserSearchModel;
-	class UserSearchDelegate;
-	class UserSearchResult;
-	class UIEventStream;
-	class QtUserSearchFirstPage;
-	class QtUserSearchFirstMultiJIDPage;
-	class QtUserSearchFieldsPage;
-	class QtUserSearchResultsPage;
-	class QtUserSearchDetailsPage;
-	class QtFormResultItemModel;
-	class SettingsProvider;
+    class UserSearchModel;
+    class UserSearchDelegate;
+    class UserSearchResult;
+    class UIEventStream;
+    class QtUserSearchFirstPage;
+    class QtUserSearchFirstMultiJIDPage;
+    class QtUserSearchFieldsPage;
+    class QtUserSearchResultsPage;
+    class QtUserSearchDetailsPage;
+    class QtFormResultItemModel;
+    class SettingsProvider;
 
-	class QtUserSearchWindow : public QWizard, public UserSearchWindow, private Ui::QtUserSearchWizard {
-		Q_OBJECT
-		public:
-			QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider);
-			virtual ~QtUserSearchWindow();
+    class QtUserSearchWindow : public QWizard, public UserSearchWindow, private Ui::QtUserSearchWizard {
+        Q_OBJECT
+        public:
+            QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider);
+            virtual ~QtUserSearchWindow() override;
 
-			virtual void addSavedServices(const std::vector<JID>& services);
+            virtual void addSavedServices(const std::vector<JID>& services) override;
 
-			virtual void clear();
-			virtual void show();
-			virtual void setResults(const std::vector<UserSearchResult>& results);
-			virtual void setResultsForm(Form::ref results);
-			virtual void setSelectedService(const JID& jid);
-			virtual void setServerSupportsSearch(bool error);
-			virtual void setSearchError(bool error);
-			virtual void setSearchFields(boost::shared_ptr<SearchPayload> fields);
-			virtual void setNameSuggestions(const std::vector<std::string>& suggestions);
-			virtual void prepopulateJIDAndName(const JID& jid, const std::string& name);
-			virtual void setContactSuggestions(const std::vector<Contact>& suggestions);
-			virtual void setJIDs(const std::vector<JID> &jids);
-			virtual void setRoomJID(const JID &roomJID);
-			virtual std::string getReason() const;
-			virtual std::vector<JID> getJIDs() const;
-			virtual void setCanStartImpromptuChats(bool supportsImpromptu);
-			virtual void updateContacts(const std::vector<Contact> &contacts);
+            virtual void clear() override;
+            virtual void show() override;
+            virtual void setResults(const std::vector<UserSearchResult>& results) override;
+            virtual void setResultsForm(Form::ref results) override;
+            virtual void setSelectedService(const JID& jid) override;
+            virtual void setServerSupportsSearch(bool error) override;
+            virtual void setSearchError(bool error) override;
+            virtual void setSearchFields(std::shared_ptr<SearchPayload> fields) override;
+            virtual void setNameSuggestions(const std::vector<std::string>& suggestions) override;
+            virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) override;
+            virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) override;
+            virtual void setJIDs(const std::vector<JID> &jids) override;
+            virtual void setOriginator(const JID& originator) override;
+            virtual void setRoomJID(const JID &roomJID) override;
+            virtual std::string getReason() const override;
+            virtual std::vector<JID> getJIDs() const override;
+            virtual void setCanStartImpromptuChats(bool supportsImpromptu) override;
+            virtual void updateContacts(const std::vector<Contact::ref> &contacts) override;
+            virtual void addContacts(const std::vector<Contact::ref>& contacts) override;
+            virtual void setCanSupplyDescription(bool allowed) override;
+            virtual void setWarning(const boost::optional<std::string>& message) override;
 
-		protected:
-			virtual int nextId() const;
+        protected:
+            virtual int nextId() const override;
 
-		private slots:
-			void handleFirstPageRadioChange();
-			virtual void handleCurrentChanged(int);
-			virtual void handleAccepted();
-			void handleContactSuggestionRequested(const QString& text);
-			void addContact();
-			void handleAddViaSearch();
-			void handleListChanged(std::vector<Contact> list);
-			void handleJIDsAdded(std::vector<JID> jids);
+        private slots:
+            void handleFirstPageRadioChange();
+            void handleCurrentChanged(int);
+            void handleAccepted();
+            void handleContactSuggestionRequested(const QString& text);
+            void addContact();
+            void handleAddViaSearch();
+            void handleListChanged(std::vector<Contact::ref> list);
+            void handleJIDsAdded(std::vector<JID> jids);
+            void handleJIDEditingDone();
 
-		private:
-			void setFirstPage(QString title = "");
-			void setSecondPage();
-			void setThirdPage();
+        private:
+            void setFirstPage(QString title = "");
+            void setSecondPage();
+            void setThirdPage();
 
-		private:
-			void clearForm();
-			void setError(const QString& error);
-			JID getServerToSearch();
-			void handleSearch();
-			JID getContactJID() const;
-			void addSearchedJIDToList(const JID& jid);
+        private:
+            void clearForm();
+            void setError(const QString& error);
+            JID getServerToSearch();
+            void handleSearch();
+            JID getContactJID() const;
+            Contact::ref getContact() const;
+            void addSearchedJIDToList(const Contact::ref& contact);
+            void handleOnSearchedJIDSelected(const Contact::ref& contact);
 
-		private:
-			UIEventStream* eventStream_;
-			UserSearchWindow::Type type_;
-			QAbstractItemModel* model_;
-			UserSearchDelegate* delegate_;
-			QtUserSearchFirstPage* firstPage_;
-			QtUserSearchFirstMultiJIDPage* firstMultiJIDPage_;
-			QtUserSearchFieldsPage* fieldsPage_;
-			QtUserSearchResultsPage* resultsPage_;
-			QtUserSearchDetailsPage* detailsPage_;
-			JID myServer_;
-			JID roomJID_;
-			int lastPage_;
-			std::vector<Contact> contactVector_;
-			SettingsProvider* settings_;
-			bool searchNext_;
-			bool supportsImpromptu_;
-	};
+        private:
+            UIEventStream* eventStream_;
+            UserSearchWindow::Type type_;
+            QAbstractItemModel* model_;
+            UserSearchDelegate* delegate_;
+            QtUserSearchFirstPage* firstPage_;
+            QtUserSearchFirstMultiJIDPage* firstMultiJIDPage_;
+            QtUserSearchFieldsPage* fieldsPage_;
+            QtUserSearchResultsPage* resultsPage_;
+            QtUserSearchDetailsPage* detailsPage_;
+            JID myServer_;
+            JID roomJID_;
+            JID originatorJID_;
+            int lastPage_;
+            std::vector<Contact::ref> contactVector_;
+            SettingsProvider* settings_;
+            bool searchNext_;
+            bool supportsImpromptu_;
+    };
 }