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

Fix some shadow warnings

Browse source
This commit is contained in:
Nicolas Werner 2020-12-18 04:21:51 +01:00
parent 15d8eb2b8b
commit 02163636a6
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Olm.cpp
View file

@ -241,32 +241,32 @@ handle_olm_message(const OlmMessage &msg)
} }
using namespace mtx::events; using namespace mtx::events;
if (auto e = if (auto e1 =
std::get_if<DeviceEvent<msg::KeyVerificationAccept>>(&device_event)) { std::get_if<DeviceEvent<msg::KeyVerificationAccept>>(&device_event)) {
ChatPage::instance()->receivedDeviceVerificationAccept(e->content); ChatPage::instance()->receivedDeviceVerificationAccept(e1->content);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationRequest>>( } else if (auto e2 = std::get_if<DeviceEvent<msg::KeyVerificationRequest>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationRequest(e->content, ChatPage::instance()->receivedDeviceVerificationRequest(e2->content,
e->sender); e2->sender);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationCancel>>( } else if (auto e3 = std::get_if<DeviceEvent<msg::KeyVerificationCancel>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationCancel(e->content); ChatPage::instance()->receivedDeviceVerificationCancel(e3->content);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationKey>>( } else if (auto e4 = std::get_if<DeviceEvent<msg::KeyVerificationKey>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationKey(e->content); ChatPage::instance()->receivedDeviceVerificationKey(e4->content);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationMac>>( } else if (auto e5 = std::get_if<DeviceEvent<msg::KeyVerificationMac>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationMac(e->content); ChatPage::instance()->receivedDeviceVerificationMac(e5->content);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationStart>>( } else if (auto e6 = std::get_if<DeviceEvent<msg::KeyVerificationStart>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationStart(e->content, ChatPage::instance()->receivedDeviceVerificationStart(e6->content,
e->sender); e6->sender);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationReady>>( } else if (auto e7 = std::get_if<DeviceEvent<msg::KeyVerificationReady>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationReady(e->content); ChatPage::instance()->receivedDeviceVerificationReady(e7->content);
} else if (auto e = std::get_if<DeviceEvent<msg::KeyVerificationDone>>( } else if (auto e8 = std::get_if<DeviceEvent<msg::KeyVerificationDone>>(
&device_event)) { &device_event)) {
ChatPage::instance()->receivedDeviceVerificationDone(e->content); ChatPage::instance()->receivedDeviceVerificationDone(e8->content);
} else if (auto roomKey = } else if (auto roomKey =
std::get_if<DeviceEvent<msg::RoomKey>>(&device_event)) { std::get_if<DeviceEvent<msg::RoomKey>>(&device_event)) {
create_inbound_megolm_session(*roomKey, msg.sender_key); create_inbound_megolm_session(*roomKey, msg.sender_key);
@ -346,9 +346,9 @@ handle_olm_message(const OlmMessage &msg)
request_id_to_secret_name.erase(secret_name); request_id_to_secret_name.erase(secret_name);
} }
} else if (auto e = } else if (auto sec_req =
std::get_if<DeviceEvent<msg::SecretRequest>>(&device_event)) { std::get_if<DeviceEvent<msg::SecretRequest>>(&device_event)) {
handle_secret_request(e, msg.sender); handle_secret_request(sec_req, msg.sender);
} }
return; return;