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
13 13
14#include "AccountScriptingInterface.h"14#include "AccountScriptingInterface.h"
15 15
16#include <DependencyManager.h>
17
16AccountScriptingInterface* AccountScriptingInterface::getInstance() {18AccountScriptingInterface* AccountScriptingInterface::getInstance() {
17 static AccountScriptingInterface sharedInstance;19 static AccountScriptingInterface sharedInstance;
18 return &sharedInstance;20 return &sharedInstance;
19}21}
20 22
21bool AccountScriptingInterface::isLoggedIn() {23bool AccountScriptingInterface::isLoggedIn() {
22 AccountManager& accountManager = AccountManager::getInstance();24 auto accountManager = DependencyManager::get<AccountManager>();
23 return accountManager.isLoggedIn();25 return accountManager->isLoggedIn();
24}26}
25 27
26QString AccountScriptingInterface::getUsername() {28QString AccountScriptingInterface::getUsername() {
27 AccountManager& accountManager = AccountManager::getInstance();29 auto accountManager = DependencyManager::get<AccountManager>();
28 if (accountManager.isLoggedIn()) {30 if (accountManager->isLoggedIn()) {
29 return accountManager.getAccountInfo().getUsername();31 return accountManager->getAccountInfo().getUsername();
30 } else {32 } else {
31 return "Unknown user";33 return "Unknown user";
32 }34 }