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/scripting/AccountScriptingInterface.cpp (1 of 21 files). Show all

Unified · Split

interface/src/scripting/AccountScriptingInterface.cpp+7−5
@@ -13,20 +13,22 @@ · 12 unmodified lines
1313
1414 #include "AccountScriptingInterface.h"
1515
16+#include <DependencyManager.h>
17+
1618 AccountScriptingInterface* AccountScriptingInterface::getInstance() {
1719 static AccountScriptingInterface sharedInstance;
1820 return &sharedInstance;
1921 }
2022
2123 bool AccountScriptingInterface::isLoggedIn() {
22− AccountManager& accountManager = AccountManager::getInstance();
23− return accountManager.isLoggedIn();
24+ auto accountManager = DependencyManager::get<AccountManager>();
25+ return accountManager->isLoggedIn();
2426 }
2527
2628 QString AccountScriptingInterface::getUsername() {
27− AccountManager& accountManager = AccountManager::getInstance();
28− if (accountManager.isLoggedIn()) {
29− return accountManager.getAccountInfo().getUsername();
29+ auto accountManager = DependencyManager::get<AccountManager>();
30+ if (accountManager->isLoggedIn()) {
31+ return accountManager->getAccountInfo().getUsername();
3032 } else {
3133 return "Unknown user";
3234 }