Fix a few shadowing warnings

fixes #824

src/encryption/DeviceVerificationFlow.cpp

@@ -46,10 +46,10 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
     this->sas           = olm::client()->sas_init();
     this->isMacVerified = false;
 
-    auto user_id   = userID.toStdString();
-    this->toClient = mtx::identifiers::parse<mtx::identifiers::User>(user_id);
+    auto user_id_  = userID.toStdString();
+    this->toClient = mtx::identifiers::parse<mtx::identifiers::User>(user_id_);
     cache::client()->query_keys(
-      user_id, [user_id, this](const UserKeyCache &res, mtx::http::RequestErr err) {
+      user_id_, [user_id_, this](const UserKeyCache &res, mtx::http::RequestErr err) {
           if (err) {
               nhlog::net()->warn("failed to query device keys: {},{}",
                                  mtx::errors::to_string(err->matrix_error.errcode),
@@ -59,7 +59,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
 
           if (!this->deviceId.isEmpty() &&
               (res.device_keys.find(deviceId.toStdString()) == res.device_keys.end())) {
-              nhlog::net()->warn("no devices retrieved {}", user_id);
+              nhlog::net()->warn("no devices retrieved {}", user_id_);
               return;
           }
 

src/encryption/Olm.cpp

@@ -1617,8 +1617,8 @@ download_cross_signing_keys()
                                        [secrets::cross_signing_user_signing] =
                                          user_signing_key->encrypted.begin()->second;
 
-                            for (const auto &[key, secrets] : secrets)
-                                unlock_secrets(key, secrets);
+                            for (const auto &[key, secret_] : secrets)
+                                unlock_secrets(key, secret_);
                         });
                   });
             });

src/encryption/SelfVerificationStatus.cpp

@@ -171,13 +171,13 @@ SelfVerificationStatus::setupCrosssigning(bool useSSSS, QString password, bool u
                         }
 
                         for (const auto &[user_id, tmp] : res.errors)
-                            for (const auto &[key_id, e] : tmp)
+                            for (const auto &[key_id, e_] : tmp)
                                 nhlog::net()->error("signature error for user {} and key "
                                                     "id {}: {}, {}",
                                                     user_id,
                                                     key_id,
-                                                    mtx::errors::to_string(e.errcode),
-                                                    e.error);
+                                                    mtx::errors::to_string(e_.errcode),
+                                                    e_.error);
                     });
               }
           }
@@ -244,8 +244,8 @@ SelfVerificationStatus::verifyUnverifiedDevices()
         return;
 
     std::vector<QString> devices;
-    for (const auto &[device, keys] : keys->device_keys) {
-        (void)keys;
+    for (const auto &[device, keys_] : keys->device_keys) {
+        (void)keys_;
         if (!verif.verified_devices.count(device))
             devices.push_back(QString::fromStdString(device));
     }