summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-07-19 17:13:55 (GMT)
committerKevin Smith <git@kismith.co.uk>2018-07-19 18:40:10 (GMT)
commit5b4a0ba19ae6994db6a193a231fd2486bff6f0ec (patch)
treeeb5616c9977d0a76c0442879fce4cdc023e19c4e /Swift/QtUI
parentcc4bdf756f3e9f9451231d59d2b5dcacd1af6d1e (diff)
downloadswift-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.cpp10
-rw-r--r--Swift/QtUI/QtSwift.h4
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
@@ -37,3 +37,3 @@
#include <Swift/Controllers/BuildVersion.h>
-#include <Swift/Controllers/MainController.h>
+#include <Swift/Controllers/AccountController.h>
#include <Swift/Controllers/SettingConstants.h>
@@ -301,3 +301,3 @@ QtSwift::~QtSwift() {
}
- for (auto* controller : mainControllers_) {
+ for (auto* controller : accountControllers_) {
delete controller;
@@ -405,3 +405,3 @@ QtLoginWindow* QtSwift::addAccount() {
uiFactories_.push_back(uiFactory);
- MainController* mainController = new MainController(
+ AccountController* accountController = new AccountController(
&clientMainThreadCaller_,
@@ -420,5 +420,5 @@ QtLoginWindow* QtSwift::addAccount() {
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);
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
@@ -45,3 +45,3 @@ namespace Swift {
class EventLoop;
- class MainController;
+ class AccountController;
class Notifier;
@@ -91,3 +91,3 @@ namespace Swift {
QtChatWindowFactory* chatWindowFactory_;
- std::vector<MainController*> mainControllers_;
+ std::vector<AccountController*> accountControllers_;
std::vector<QtSystemTray*> systemTrays_;