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,17 +1,19 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <map>
 #include <string>
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
 #include <Swiften/Base/Platform.h>
+#include <Swiften/Client/ClientOptions.h>
 #include <Swiften/EventLoop/Qt/QtEventLoop.h>
 #include <Swiften/Network/BoostNetworkFactories.h>
 #include <Swiften/TLS/PlatformTLSFactories.h>
@@ -35,27 +37,28 @@ namespace po = boost::program_options;
 class QSplitter;
 
 namespace Swift {
-    class QtUIFactory;
-    class CertificateStorageFactory;
-    class Dock;
-    class Notifier;
-    class StoragesFactory;
     class ApplicationPathProvider;
     class AvatarStorage;
     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;
 
     class QtSwift : public QObject {
         Q_OBJECT
@@ -67,28 +70,35 @@ namespace Swift {
         private slots:
             void handleAboutToQuit();
             void handleAutoUpdaterStateChanged(AutoUpdater::State updatedState);
+            void handleWantsToAddAccount();
 
         private:
             XMLSettingsProvider* loadSettingsFile(const QString& fileName);
             void loadEmoticonsFile(const QString& fileName, std::map<std::string, std::string>& emoticons);
             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();
 
         private:
             QtEventLoop clientMainThreadCaller_;
             PlatformTLSFactories tlsFactories_;
             BoostNetworkFactories networkFactories_;
             QtChatWindowFactory* chatWindowFactory_;
-            std::vector<MainController*> mainControllers_;
+            std::vector<AccountController*> accountControllers_;
             std::vector<QtSystemTray*> systemTrays_;
             std::vector<QtUIFactory*> uiFactories_;
             QtSettingsProvider* qtSettings_;
             XMLSettingsProvider* xmlSettings_;
-            SettingsProviderHierachy* settingsHierachy_;
+            SettingsProviderHierachy* settingsHierarchy_;
             QtSingleWindow* splitter_;
             QtSoundPlayer* soundPlayer_;
             Dock* dock_;
             URIHandler* uriHandler_;
-            QtChatTabsBase* tabs_;
             ApplicationPathProvider* applicationPathProvider_;
             StoragesFactory* storagesFactory_;
             CertificateStorageFactory* certificateStorageFactory_;
@@ -97,6 +107,9 @@ namespace Swift {
             StatusCache* statusCache_;
             PlatformIdleQuerier idleQuerier_;
             ActualIdleDetector idleDetector_;
+            std::map<std::string, std::string> emoticons_;
+            bool enableAdHocCommandOnJID_ = false;
+            bool useDelayForLatency_;
 #if defined(SWIFTEN_PLATFORM_MACOSX)
             CocoaApplication cocoaApplication_;
             CocoaApplicationActivateHelper cocoaApplicationActivateHelper_;