d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove shadowing loginMethod

Browse source
This commit is contained in:
Nicolas Werner 2020-05-10 01:00:20 +02:00
parent 9713284435
commit 6befadeec8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/LoginPage.cpp
View file

@ -311,9 +311,9 @@ LoginPage::versionError(const QString &error)
} }
void void
LoginPage::versionOk(LoginMethod loginMethod) LoginPage::versionOk(LoginMethod loginMethod_)
{ {
this->loginMethod = loginMethod; this->loginMethod = loginMethod_;
serverLayout_->removeWidget(spinner_); serverLayout_->removeWidget(spinner_);
matrixidLayout_->removeWidget(spinner_); matrixidLayout_->removeWidget(spinner_);
@ -372,8 +372,8 @@ LoginPage::onLoginButtonClicked()
auto sso = new SSOHandler(); auto sso = new SSOHandler();
connect(sso, &SSOHandler::ssoSuccess, this, [this, sso](std::string token) { connect(sso, &SSOHandler::ssoSuccess, this, [this, sso](std::string token) {
mtx::requests::Login req{}; mtx::requests::Login req{};
req.token = token; req.token = token;
req.type = mtx::user_interactive::auth_types::token; req.type = mtx::user_interactive::auth_types::token;
req.device_id = deviceName_->text().trimmed().isEmpty() req.device_id = deviceName_->text().trimmed().isEmpty()
? initialDeviceName() ? initialDeviceName()
: deviceName_->text().toStdString(); : deviceName_->text().toStdString();