1 files changed, 45 insertions, 40 deletions
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index 3b10041..e4b4657 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -1,49 +1,54 @@
 /*
- * 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 <memory>
 #include <string>
-#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/StatusShow.h"
-#include "Swiften/Elements/DiscoItems.h"
-#include "Swiften/TLS/Certificate.h"
-#include "Swiften/Base/boost_bsignals.h"
-#include <boost/shared_ptr.hpp>
+
+#include <boost/signals2.hpp>
+
+#include <Swiften/Elements/DiscoItems.h>
+#include <Swiften/Elements/StatusShow.h>
+#include <Swiften/TLS/Certificate.h>
+
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
 
 namespace Swift {
-	class Roster;
-
-	class MainWindow {
-		public:
-			MainWindow(bool candelete = true) : canDelete_(candelete) {}
-			virtual ~MainWindow() {}
-
-			bool canDelete() const {
-				return canDelete_;
-			}
-
-			virtual void setMyNick(const std::string& name) = 0;
-			virtual void setMyJID(const JID& jid) = 0;
-			virtual void setMyAvatarPath(const std::string& path) = 0;
-			virtual void setMyStatusText(const std::string& status) = 0;
-			virtual void setMyStatusType(StatusShow::Type type) = 0;
-			/** Must be able to cope with NULL to clear the roster */
-			virtual void setRosterModel(Roster* roster) = 0;
-			virtual void setConnecting() = 0;
-			virtual void setBlockingCommandAvailable(bool isAvailable) = 0;
-			virtual void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) = 0;
-			virtual void setStreamEncryptionStatus(bool tlsInPlaceAndValid) = 0;
-			virtual void openCertificateDialog(const std::vector<Certificate::ref>& chain) = 0;
-			
-			boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
-			boost::signal<void ()> onSignOutRequest;
-			boost::signal<void ()> onShowCertificateRequest;
-
-		private:
-			bool canDelete_;
-	};
+    class JID;
+    class Roster;
+
+    class MainWindow {
+        public:
+            MainWindow(bool candelete = true) : canDelete_(candelete) {}
+            virtual ~MainWindow() {}
+
+            bool canDelete() const {
+                return canDelete_;
+            }
+
+            virtual void setMyNick(const std::string& name) = 0;
+            virtual void setMyJID(const JID& jid) = 0;
+            virtual void setMyAvatarPath(const std::string& path) = 0;
+            virtual void setMyStatusText(const std::string& status) = 0;
+            virtual void setMyStatusType(StatusShow::Type type) = 0;
+            virtual void setMyContactRosterItem(std::shared_ptr<ContactRosterItem> contact) = 0;
+            /** Must be able to cope with NULL to clear the roster */
+            virtual void setRosterModel(Roster* roster) = 0;
+            virtual void setConnecting() = 0;
+            virtual void setBlockingCommandAvailable(bool isAvailable) = 0;
+            virtual void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) = 0;
+            virtual void setStreamEncryptionStatus(bool tlsInPlaceAndValid) = 0;
+            virtual void openCertificateDialog(const std::vector<Certificate::ref>& chain) = 0;
+
+            boost::signals2::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
+            boost::signals2::signal<void ()> onSignOutRequest;
+            boost::signals2::signal<void ()> onShowCertificateRequest;
+
+        private:
+            bool canDelete_;
+    };
 }