From d5fc1caaaf36ce3eec92f98c2cf2a86cce89a107 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 25 Feb 2014 16:12:25 -0800 Subject: [PATCH] fix wording for access token change signal --- interface/src/Menu.cpp | 2 +- libraries/shared/src/AccountManager.cpp | 4 ++-- libraries/shared/src/AccountManager.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1180f4753e..96b8654c2b 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -94,7 +94,7 @@ Menu::Menu() : toggleLoginMenuItem(); // connect to the appropriate slots of the AccountManager so that we can change the Login/Logout menu item - connect(&accountManager, &AccountManager::foundOrRequestedAccessToken, this, &Menu::toggleLoginMenuItem); + connect(&accountManager, &AccountManager::accessTokenChanged, this, &Menu::toggleLoginMenuItem); connect(&accountManager, &AccountManager::logoutComplete, this, &Menu::toggleLoginMenuItem); addDisabledActionAndSeparator(fileMenu, "Scripts"); diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp index 4acb9e080e..0f39ba4146 100644 --- a/libraries/shared/src/AccountManager.cpp +++ b/libraries/shared/src/AccountManager.cpp @@ -89,7 +89,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) { _accountInfo = settings.value(key).value(); qDebug() << "Found a data-server access token for" << qPrintable(keyURL.toString()); - emit foundOrRequestedAccessToken(); + emit accessTokenChanged(); } } @@ -275,7 +275,7 @@ void AccountManager::requestFinished() { emit usernameChanged(_accountInfo.getUsername()); // we have found or requested an access token - emit foundOrRequestedAccessToken(); + emit accessTokenChanged(); // store this access token into the local settings QSettings localSettings; diff --git a/libraries/shared/src/AccountManager.h b/libraries/shared/src/AccountManager.h index 1b2bb1a071..c741beb461 100644 --- a/libraries/shared/src/AccountManager.h +++ b/libraries/shared/src/AccountManager.h @@ -61,7 +61,7 @@ signals: void authRequired(); void authEndpointChanged(); void usernameChanged(const QString& username); - void foundOrRequestedAccessToken(); + void accessTokenChanged(); void loginComplete(const QUrl& authURL); void logoutComplete(); private slots: