History

Make AccountManager a DependencyManager singleton

Ryan Huffman committed 10 years ago

Commit dd093e31 parent cf49c8e21 files · +118 −117Browse files

Showing the changes to interface/src/Menu.cpp (1 of 21 files). Show all

Unified · Split

interface/src/Menu.cpp+3−3
@@ -54,7 +54,7 @@ Menu* Menu::getInstance() { · 53 unmodified lines
54 54
55Menu::Menu() {55Menu::Menu() {
56 auto dialogsManager = DependencyManager::get<DialogsManager>();56 auto dialogsManager = DependencyManager::get<DialogsManager>();
57 AccountManager& accountManager = AccountManager::getInstance();57 auto accountManager = DependencyManager::get<AccountManager>();
58 58
59 // File/Application menu ----------------------------------59 // File/Application menu ----------------------------------
60 MenuWrapper* fileMenu = addMenu("File");60 MenuWrapper* fileMenu = addMenu("File");
@@ -64,9 +64,9 @@ Menu::Menu() { · 3 unmodified lines
64 addActionToQMenuAndActionHash(fileMenu, MenuOption::Login);64 addActionToQMenuAndActionHash(fileMenu, MenuOption::Login);
65 65
66 // connect to the appropriate signal of the AccountManager so that we can change the Login/Logout menu item66 // connect to the appropriate signal of the AccountManager so that we can change the Login/Logout menu item
67 connect(&accountManager, &AccountManager::profileChanged,67 connect(accountManager.data(), &AccountManager::profileChanged,
68 dialogsManager.data(), &DialogsManager::toggleLoginDialog);68 dialogsManager.data(), &DialogsManager::toggleLoginDialog);
69 connect(&accountManager, &AccountManager::logoutComplete,69 connect(accountManager.data(), &AccountManager::logoutComplete,
70 dialogsManager.data(), &DialogsManager::toggleLoginDialog);70 dialogsManager.data(), &DialogsManager::toggleLoginDialog);
71 }71 }
72 72

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t