1 files changed, 49 insertions, 29 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index 6004347..e120831 100644
--- a/Swift/Controllers/Chat/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -29,35 +29,36 @@
 namespace Swift {
-    class EventController;
+    class AutoAcceptMUCInviteDecider;
+    class AvatarManager;
     class ChatController;
     class ChatControllerBase;
-    class MUCController;
-    class MUCManager;
+    class ChatListWindowFactory;
+    class ChatMessageParser;
+    class Chattables;
+    class ClientBlockListManager;
+    class DirectedPresenceSender;
+    class DiscoServiceWalker;
+    class EntityCapsProvider;
+    class EventController;
+    class FileTransferController;
+    class FileTransferOverview;
+    class HighlightManager;
+    class HistoryController;
+    class IQRouter;
     class JoinMUCWindow;
     class JoinMUCWindowFactory;
+    class MUCBookmarkManager;
+    class MUCController;
+    class MUCManager;
+    class MUCSearchController;
+    class MUCSearchWindowFactory;
     class NickResolver;
     class PresenceOracle;
-    class AvatarManager;
-    class StanzaChannel;
-    class IQRouter;
     class PresenceSender;
-    class MUCBookmarkManager;
-    class ChatListWindowFactory;
-    class TimerFactory;
-    class EntityCapsProvider;
-    class DirectedPresenceSender;
-    class MUCSearchWindowFactory;
     class ProfileSettingsProvider;
-    class MUCSearchController;
-    class FileTransferOverview;
-    class FileTransferController;
-    class XMPPRoster;
     class SettingsProvider;
-    class WhiteboardManager;
-    class HistoryController;
-    class HighlightManager;
-    class ClientBlockListManager;
-    class ChatMessageParser;
-    class DiscoServiceWalker;
-    class AutoAcceptMUCInviteDecider;
+    class StanzaChannel;
+    class TimerFactory;
     class VCardManager;
+    class WhiteboardManager;
+    class XMPPRoster;
 
@@ -65,3 +66,3 @@ namespace Swift {
         public:
-            ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, JoinMUCWindowFactory* joinMUCWindowFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory, bool useDelayForLatency, TimerFactory* timerFactory, MUCRegistry* mucRegistry, EntityCapsProvider* entityCapsProvider, MUCManager* mucManager, MUCSearchWindowFactory* mucSearchWindowFactory, ProfileSettingsProvider* profileSettings, FileTransferOverview* ftOverview, XMPPRoster* roster, bool eagleMode, SettingsProvider* settings, HistoryController* historyController_, WhiteboardManager* whiteboardManager, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, const std::map<std::string, std::string>& emoticons, VCardManager* vcardManager);
+            ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, JoinMUCWindowFactory* joinMUCWindowFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory, bool useDelayForLatency, TimerFactory* timerFactory, MUCRegistry* mucRegistry, EntityCapsProvider* entityCapsProvider, MUCManager* mucManager, MUCSearchWindowFactory* mucSearchWindowFactory, ProfileSettingsProvider* profileSettings, FileTransferOverview* ftOverview, XMPPRoster* roster, bool eagleMode, SettingsProvider* settings, HistoryController* historyController_, WhiteboardManager* whiteboardManager, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, const std::map<std::string, std::string>& emoticons, VCardManager* vcardManager, Chattables& chattables);
             virtual ~ChatsManager();
@@ -71,3 +72,5 @@ namespace Swift {
             void handleIncomingMessage(std::shared_ptr<Message> incomingMessage);
+#ifndef NOT_YET
             std::vector<ChatListWindow::Chat> getRecentChats() const;
+#endif
             virtual std::vector<Contact::ref> getContacts(bool withMUCNicks);
@@ -88,6 +91,8 @@ namespace Swift {
         private:
+#ifndef NOT_YET
             ChatListWindow::Chat createChatListChatItem(const JID& jid, const std::string& activity, bool privateMessage);
+#endif
             void handleChatRequest(const std::string& contact);
             void finalizeImpromptuJoin(MUC::ref muc, const std::vector<JID>& jidsToInvite, const std::string& reason, const boost::optional<JID>& reuseChatJID = boost::optional<JID>());
-            MUC::ref handleJoinMUCRequest(const JID& muc, const boost::optional<std::string>& password, const boost::optional<std::string>& nick, bool addAutoJoin, bool createAsReservedIfNew, bool isImpromptu, ChatWindow* reuseChatwindow = nullptr);
+            MUC::ref handleJoinMUCRequest(const JID& muc, const boost::optional<std::string>& password, const boost::optional<std::string>& nick, bool createAsReservedIfNew, bool isImpromptu, ChatWindow* reuseChatwindow = nullptr);
             void handleSearchMUCRequest();
@@ -107,8 +112,13 @@ namespace Swift {
             void handleWhiteboardStateChange(const JID& contact, const ChatWindow::WhiteboardSessionState state);
+#ifndef NOT_YET
             boost::optional<ChatListWindow::Chat> removeExistingChat(const ChatListWindow::Chat& chat);
+#endif
             bool messageCausesSessionBinding(std::shared_ptr<Message> message);
             void cleanupPrivateMessageRecents();
+#ifndef NOT_YET
             void appendRecent(const ChatListWindow::Chat& chat);
             void prependRecent(const ChatListWindow::Chat& chat);
+#endif
             void setupBookmarks();
+#ifndef NOT_YET
             void loadRecents();
@@ -119,2 +129,4 @@ namespace Swift {
             void handleUnreadCountChanged(ChatControllerBase* controller);
+#endif
+            void handleChattableActivated(const JID& jid);
             void handleAvatarChanged(const JID& jid);
@@ -128,8 +140,9 @@ namespace Swift {
             void handleTransformChatToMUC(ChatController* chatController, ChatWindow* chatWindow, const std::vector<JID>& jidsToInvite, const std::string& reason);
-
             void handleLocalServiceFound(const JID& service, std::shared_ptr<DiscoInfo> info);
             void handleLocalServiceWalkFinished();
-
             void updatePresenceReceivingStateOnChatController(const JID&);
+#ifndef NOT_YET
             ChatListWindow::Chat updateChatStatusAndAvatarHelper(const ChatListWindow::Chat& chat) const;
+#endif
+
 
@@ -141,2 +154,5 @@ namespace Swift {
 
+        protected:
+            MUCBookmarkManager* mucBookmarkManager_;
+
         private:
@@ -156,5 +172,6 @@ namespace Swift {
             UIEventStream* uiEventStream_;
-            MUCBookmarkManager* mucBookmarkManager_;
             std::shared_ptr<DiscoInfo> serverDiscoInfo_;
+#ifndef NOT_YET
             ChatListWindow* chatListWindow_;
+#endif
             JoinMUCWindow* joinMUCWindow_;
@@ -167,3 +184,5 @@ namespace Swift {
             MUCSearchController* mucSearchController_;
+#ifndef NOT_YET
             std::list<ChatListWindow::Chat> recentChats_;
+#endif
             ProfileSettingsProvider* profileSettings_;
@@ -184,2 +203,3 @@ namespace Swift {
             VCardManager* vcardManager_;
+            Chattables& chattables_;