From 6befadeec88c8be6db304136a079e1b56b451cc6 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 10 May 2020 01:00:20 +0200 Subject: [PATCH] Remove shadowing loginMethod --- src/LoginPage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 856c0ad3..bb329699 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -311,9 +311,9 @@ LoginPage::versionError(const QString &error) } void -LoginPage::versionOk(LoginMethod loginMethod) +LoginPage::versionOk(LoginMethod loginMethod_) { - this->loginMethod = loginMethod; + this->loginMethod = loginMethod_; serverLayout_->removeWidget(spinner_); matrixidLayout_->removeWidget(spinner_); @@ -372,8 +372,8 @@ LoginPage::onLoginButtonClicked() auto sso = new SSOHandler(); connect(sso, &SSOHandler::ssoSuccess, this, [this, sso](std::string token) { mtx::requests::Login req{}; - req.token = token; - req.type = mtx::user_interactive::auth_types::token; + req.token = token; + req.type = mtx::user_interactive::auth_types::token; req.device_id = deviceName_->text().trimmed().isEmpty() ? initialDeviceName() : deviceName_->text().toStdString();