Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 22:16:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused aliases.

Browse source
This commit is contained in:
Kasen IO 2020-08-05 02:30:30 -04:00
parent 6b0fc8fd66
commit 658e14be25
4 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -91,7 +91,7 @@ Menu::Menu() {
auto domainLogin = addActionToQMenuAndActionHash(fileMenu, "Domain: Log In"); auto domainLogin = addActionToQMenuAndActionHash(fileMenu, "Domain: Log In");
connect(domainLogin, &QAction::triggered, [] { connect(domainLogin, &QAction::triggered, [] {
auto dialogsManager = DependencyManager::get<DialogsManager>(); auto dialogsManager = DependencyManager::get<DialogsManager>();
dialogsManager->requestDomainLoginState(); dialogsManager->setDomainLoginState();
dialogsManager->showDomainLoginDialog(); dialogsManager->showDomainLoginDialog();
}); });

10
interface/src/ui/DialogsManager.cpp
View file

@ -110,16 +110,8 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
} }
} }
void DialogsManager::requestMetaverseLoginState() {
DialogsManager::setMetaverseLoginState();
}
void DialogsManager::requestDomainLoginState() {
DialogsManager::setDomainLoginState();
}
void DialogsManager::setMetaverseLoginState() { void DialogsManager::setMetaverseLoginState() {
// We're only turning off the domain login trigger but the actual domain auth URL is still saved. // We're only turning off the domain login trigger but the actual domain auth URL is still saved.
// So we can continue the domain login if desired. // So we can continue the domain login if desired.
_isDomainLogin = false; _isDomainLogin = false;
} }

6
interface/src/ui/DialogsManager.h
View file

@ -41,8 +41,8 @@ public:
QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; } QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; }
void emitAddressBarShown(bool visible) { emit addressBarShown(visible); } void emitAddressBarShown(bool visible) { emit addressBarShown(visible); }
void setAddressBarVisible(bool addressBarVisible); void setAddressBarVisible(bool addressBarVisible);
void requestMetaverseLoginState(); void setMetaverseLoginState();
void requestDomainLoginState(); void setDomainLoginState();
bool getIsDomainLogin() { return _isDomainLogin; } bool getIsDomainLogin() { return _isDomainLogin; }
QString getDomainLoginDomain() { return _domainLoginDomain; } QString getDomainLoginDomain() { return _domainLoginDomain; }
@ -90,8 +90,6 @@ private:
bool _addressBarVisible { false }; bool _addressBarVisible { false };
void setDomainLogin(bool isDomainLogin, const QString& domain = ""); void setDomainLogin(bool isDomainLogin, const QString& domain = "");
void setMetaverseLoginState();
void setDomainLoginState();
bool _isDomainLogin { false }; bool _isDomainLogin { false };
QString _domainLoginDomain; QString _domainLoginDomain;
}; };

2
interface/src/ui/LoginDialog.cpp
View file

@ -108,7 +108,7 @@ void LoginDialog::toggleAction() {
// if not in login state, show. // if not in login state, show.
if (!qApp->getLoginDialogPoppedUp()) { if (!qApp->getLoginDialogPoppedUp()) {
auto dialogsManager = DependencyManager::get<DialogsManager>(); auto dialogsManager = DependencyManager::get<DialogsManager>();
dialogsManager->requestMetaverseLoginState(); dialogsManager->setMetaverseLoginState();
LoginDialog::showWithSelection(); LoginDialog::showWithSelection();
} }
}); });