Swiftdiff options
| author | Thanos Doukoudakis <thanos.doukoudakis@isode.com> | 2018-07-19 17:13:55 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2018-07-19 18:40:10 (GMT) |
| commit | 5b4a0ba19ae6994db6a193a231fd2486bff6f0ec (patch) | |
| tree | eb5616c9977d0a76c0442879fce4cdc023e19c4e /Swift/QtUI | |
| parent | cc4bdf756f3e9f9451231d59d2b5dcacd1af6d1e (diff) | |
| download | swift-5b4a0ba19ae6994db6a193a231fd2486bff6f0ec.zip swift-5b4a0ba19ae6994db6a193a231fd2486bff6f0ec.tar.bz2 | |
Rename MainController to AccountController
Change-Id: I9c006a2435294f2afb95a95bd856ad64274a8752
Test-Information:
None.
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 10 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 28c7044..8de5d70 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -35,7 +35,7 @@ #include <Swift/Controllers/ApplicationInfo.h> #include <Swift/Controllers/BuildVersion.h> -#include <Swift/Controllers/MainController.h> +#include <Swift/Controllers/AccountController.h> #include <Swift/Controllers/SettingConstants.h> #include <Swift/Controllers/Settings/SettingsProviderHierachy.h> #include <Swift/Controllers/Settings/XMLSettingsProvider.h> @@ -299,7 +299,7 @@ QtSwift::~QtSwift() { for (auto* factory : uiFactories_) { delete factory; } - for (auto* controller : mainControllers_) { + for (auto* controller : accountControllers_) { delete controller; } delete notifier_; @@ -403,7 +403,7 @@ QtLoginWindow* QtSwift::addAccount() { auto tabs = new QtChatTabs(settingsHierarchy_, true); QtUIFactory* uiFactory = new QtUIFactory(settingsHierarchy_, qtSettings_, tabs, splitter_, systemTrays_[systemTrays_.size() - 1], networkFactories_.getTimerFactory(), statusCache_, autoUpdater_, emoticons_, enableAdHocCommandOnJID_); uiFactories_.push_back(uiFactory); - MainController* mainController = new MainController( + AccountController* accountController = new AccountController( &clientMainThreadCaller_, &networkFactories_, uiFactory, @@ -418,9 +418,9 @@ QtLoginWindow* QtSwift::addAccount() { &idleDetector_, emoticons_, useDelayForLatency_); - mainControllers_.push_back(mainController); + accountControllers_.push_back(accountController); - //FIXME - mainController has already created the window, so we can pass null here and get the old one + //FIXME - accountController has already created the window, so we can pass null here and get the old one auto loginWindow = uiFactory->createLoginWindow(nullptr); return dynamic_cast<QtLoginWindow*>(loginWindow); diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index d876cd8..811b6e4 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -43,7 +43,7 @@ namespace Swift { class CertificateStorageFactory; class Dock; class EventLoop; - class MainController; + class AccountController; class Notifier; class QtChatTabs; class QtChatWindowFactory; @@ -89,7 +89,7 @@ namespace Swift { PlatformTLSFactories tlsFactories_; BoostNetworkFactories networkFactories_; QtChatWindowFactory* chatWindowFactory_; - std::vector<MainController*> mainControllers_; + std::vector<AccountController*> accountControllers_; std::vector<QtSystemTray*> systemTrays_; std::vector<QtUIFactory*> uiFactories_; QtSettingsProvider* qtSettings_; |