From 658e14be25ad41523677ffedef2cf3fb03678732 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Wed, 5 Aug 2020 02:30:30 -0400 Subject: [PATCH] Remove unused aliases. --- interface/src/Menu.cpp | 2 +- interface/src/ui/DialogsManager.cpp | 10 +--------- interface/src/ui/DialogsManager.h | 6 ++---- interface/src/ui/LoginDialog.cpp | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index dbe60c4b7e..f40082c1e7 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -91,7 +91,7 @@ Menu::Menu() { auto domainLogin = addActionToQMenuAndActionHash(fileMenu, "Domain: Log In"); connect(domainLogin, &QAction::triggered, [] { auto dialogsManager = DependencyManager::get(); - dialogsManager->requestDomainLoginState(); + dialogsManager->setDomainLoginState(); dialogsManager->showDomainLoginDialog(); }); diff --git a/interface/src/ui/DialogsManager.cpp b/interface/src/ui/DialogsManager.cpp index 01bf69178f..ae4f43d6fa 100644 --- a/interface/src/ui/DialogsManager.cpp +++ b/interface/src/ui/DialogsManager.cpp @@ -110,16 +110,8 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) { } } -void DialogsManager::requestMetaverseLoginState() { - DialogsManager::setMetaverseLoginState(); -} - -void DialogsManager::requestDomainLoginState() { - DialogsManager::setDomainLoginState(); -} - 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. _isDomainLogin = false; } diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h index 0f391d9758..864174296e 100644 --- a/interface/src/ui/DialogsManager.h +++ b/interface/src/ui/DialogsManager.h @@ -41,8 +41,8 @@ public: QPointer getTestingDialog() const { return _testingDialog; } void emitAddressBarShown(bool visible) { emit addressBarShown(visible); } void setAddressBarVisible(bool addressBarVisible); - void requestMetaverseLoginState(); - void requestDomainLoginState(); + void setMetaverseLoginState(); + void setDomainLoginState(); bool getIsDomainLogin() { return _isDomainLogin; } QString getDomainLoginDomain() { return _domainLoginDomain; } @@ -90,8 +90,6 @@ private: bool _addressBarVisible { false }; void setDomainLogin(bool isDomainLogin, const QString& domain = ""); - void setMetaverseLoginState(); - void setDomainLoginState(); bool _isDomainLogin { false }; QString _domainLoginDomain; }; diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 71ae1eec83..b45a62ae3a 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -108,7 +108,7 @@ void LoginDialog::toggleAction() { // if not in login state, show. if (!qApp->getLoginDialogPoppedUp()) { auto dialogsManager = DependencyManager::get(); - dialogsManager->requestMetaverseLoginState(); + dialogsManager->setMetaverseLoginState(); LoginDialog::showWithSelection(); } });