Merge branch 'macos-ci-fix' into 'master'

Macos ci fix

See merge request nheko-reborn/nheko!3

2 files changed, 4 insertions, 4 deletions

diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp

index 39d0f9d6..dba5ba51 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -315,14 +315,14 @@ LoginPage::checkHomeserverVersion()
                             if (err || flows.flows.empty())
                                     emit versionOkCb(LoginMethod::Password);
 
-                            LoginMethod loginMethod = LoginMethod::Password;
+                            LoginMethod loginMethod_ = LoginMethod::Password;
                             for (const auto &flow : flows.flows) {
                                     if (flow.type == mtx::user_interactive::auth_types::sso) {
-                                            loginMethod = LoginMethod::SSO;
+                                            loginMethod_ = LoginMethod::SSO;
                                             break;
                                     }
                             }
-                            emit versionOk(loginMethod);
+                            emit versionOk(loginMethod_);
                     });
           });
 }
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp

index 4ca3be49..7c7ef9ab 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -54,7 +54,7 @@ QSharedPointer<UserSettings> UserSettings::instance_;
 
 UserSettings::UserSettings()
 {
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [this]() {
+        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, []() {
                 instance_.clear();
         });
 }