1 files changed, 19 insertions, 19 deletions
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index 9989101..04836fe 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -19,4 +19,5 @@ namespace Swift {
     class AutoUpdater;
+    class Chattables;
+    class FdpFormSubmitWindow;
     class QtChatTabs;
-    class QtChatTabsBase;
     class QtChatTheme;
@@ -37,3 +38,3 @@ namespace Swift {
         public:
-            QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabsBase* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID);
+            QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, std::map<std::string, std::string>& emoticons, bool enableAdHocCommandOnJID);
             ~QtUIFactory();
@@ -41,3 +42,3 @@ namespace Swift {
             virtual HistoryWindow* createHistoryWindow(UIEventStream*);
-            virtual MainWindow* createMainWindow(UIEventStream* eventStream);
+            virtual MainWindow* createMainWindow(Chattables& chattables, UIEventStream* eventStream);
             virtual LoginWindow* createLoginWindow(UIEventStream* eventStream);
@@ -56,5 +57,5 @@ namespace Swift {
             virtual AdHocCommandWindow* createAdHocCommandWindow(std::shared_ptr<OutgoingAdHocCommandSession> command);
+            virtual std::unique_ptr<FdpFormSubmitWindow> createFdpFormSubmitWindow();
 
         private slots:
-            void handleLoginWindowGeometryChanged();
             void handleChatWindowFontResized(int);
@@ -66,19 +67,18 @@ namespace Swift {
         private:
-            SettingsProviderHierachy* settings;
-            QtSettingsProvider* qtOnlySettings;
-            QtChatTabsBase* tabsBase;
-            QtChatTabs* tabs;
-            QtSingleWindow* netbookSplitter;
-            QtSystemTray* systemTray;
-            QtChatWindowFactory* chatWindowFactory;
+            SettingsProviderHierachy* settings_;
+            QtSettingsProvider* qtOnlySettings_;
+            QtChatTabs* tabs_;
+            QtSingleWindow* netbookSplitter_;
+            QtSystemTray* systemTray_;
+            QtChatWindowFactory* chatWindowFactory_;
             TimerFactory* timerFactory_;
-            QtMainWindow* lastMainWindow;
-            QtLoginWindow* loginWindow;
-            StatusCache* statusCache;
-            AutoUpdater* autoUpdater;
-            std::vector<QPointer<QtChatWindow> > chatWindows;
-            bool startMinimized;
-            int chatFontSize;
+            QtMainWindow* lastMainWindow_;
+            QtLoginWindow* loginWindow_;
+            StatusCache* statusCache_;
+            AutoUpdater* autoUpdater_;
+            std::vector<QPointer<QtChatWindow> > chatWindows_;
+            int chatFontSize_;
             int historyFontSize_;
             bool emoticonsExist_;
+            std::map<std::string, std::string>& emoticons_;
             bool enableAdHocCommandOnJID_;