1 files changed, 30 insertions, 17 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index a7dc3cf..811b6e4 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -8,2 +8,3 @@
 
+#include <map>
 #include <string>
@@ -14,2 +15,3 @@
 #include <Swiften/Base/Platform.h>
+#include <Swiften/Client/ClientOptions.h>
 #include <Swiften/EventLoop/Qt/QtEventLoop.h>
@@ -37,7 +39,2 @@ class QSplitter;
 namespace Swift {
-    class QtUIFactory;
-    class CertificateStorageFactory;
-    class Dock;
-    class Notifier;
-    class StoragesFactory;
     class ApplicationPathProvider;
@@ -45,15 +42,21 @@ namespace Swift {
     class CapsStorage;
-    class MainController;
-    class QtSystemTray;
-    class QtChatTabsBase;
+    class CertificateStorageFactory;
+    class Dock;
+    class EventLoop;
+    class AccountController;
+    class Notifier;
+    class QtChatTabs;
     class QtChatWindowFactory;
-    class QtSoundPlayer;
+    class QtLoginWindow;
     class QtMUCSearchWindowFactory;
+    class QtSingleWindow;
+    class QtSoundPlayer;
+    class QtSystemTray;
+    class QtUIFactory;
     class QtUserSearchWindowFactory;
-    class EventLoop;
-    class URIHandler;
     class SettingsProviderHierachy;
-    class XMLSettingsProvider;
     class StatusCache;
-    class QtSingleWindow;
+    class StoragesFactory;
+    class URIHandler;
+    class XMLSettingsProvider;
 
@@ -69,2 +72,3 @@ namespace Swift {
             void handleAutoUpdaterStateChanged(AutoUpdater::State updatedState);
+            void handleWantsToAddAccount();
 
@@ -74,2 +78,9 @@ namespace Swift {
             static const std::string& updateChannelToFeed(const std::string& channel);
+            QtLoginWindow* addAccount();
+            ClientOptions parseClientOptions(const std::string& optionString);
+            void restoreAccounts();
+            /**
+            * Upgrades the config from pre-multi-account to post-multi-account format (added in 5.0).
+            */
+            void migrateLastLoginAccount();
 
@@ -80,3 +91,3 @@ namespace Swift {
             QtChatWindowFactory* chatWindowFactory_;
-            std::vector<MainController*> mainControllers_;
+            std::vector<AccountController*> accountControllers_;
             std::vector<QtSystemTray*> systemTrays_;
@@ -85,3 +96,3 @@ namespace Swift {
             XMLSettingsProvider* xmlSettings_;
-            SettingsProviderHierachy* settingsHierachy_;
+            SettingsProviderHierachy* settingsHierarchy_;
             QtSingleWindow* splitter_;
@@ -90,3 +101,2 @@ namespace Swift {
             URIHandler* uriHandler_;
-            QtChatTabsBase* tabs_;
             ApplicationPathProvider* applicationPathProvider_;
@@ -99,2 +109,5 @@ namespace Swift {
             ActualIdleDetector idleDetector_;
+            std::map<std::string, std::string> emoticons_;
+            bool enableAdHocCommandOnJID_ = false;
+            bool useDelayForLatency_;
 #if defined(SWIFTEN_PLATFORM_MACOSX)