From f95998a64bebcb12ffe07fcb6f23cdabff434641 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 20 Feb 2018 17:09:11 +0200 Subject: Be explicit about the captured parameters in lambdas --- src/dialogs/CreateRoom.cc | 10 +++++----- src/dialogs/InviteUsers.cc | 4 ++-- src/dialogs/JoinRoom.cc | 4 ++-- src/dialogs/LeaveRoom.cc | 4 ++-- src/dialogs/Logout.cc | 4 ++-- src/dialogs/PreviewUploadOverlay.cc | 2 +- src/dialogs/ReadReceipts.cc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/CreateRoom.cc b/src/dialogs/CreateRoom.cc index 0bda0d00..8c2cc641 100644 --- a/src/dialogs/CreateRoom.cc +++ b/src/dialogs/CreateRoom.cc @@ -93,7 +93,7 @@ CreateRoom::CreateRoom(QWidget *parent) layout->addLayout(directLayout); layout->addLayout(buttonLayout); - connect(confirmBtn_, &QPushButton::clicked, this, [=]() { + connect(confirmBtn_, &QPushButton::clicked, this, [this]() { request_.name = nameInput_->text().toStdString(); request_.topic = topicInput_->text().toStdString(); request_.room_alias_name = aliasInput_->text().toStdString(); @@ -103,7 +103,7 @@ CreateRoom::CreateRoom(QWidget *parent) clearFields(); }); - connect(cancelBtn_, &QPushButton::clicked, this, [=]() { + connect(cancelBtn_, &QPushButton::clicked, this, [this]() { emit closing(false, request_); clearFields(); @@ -111,7 +111,7 @@ CreateRoom::CreateRoom(QWidget *parent) connect(visibilityCombo_, static_cast(&QComboBox::activated), - [=](const QString &text) { + [this](const QString &text) { if (text == "Private") { request_.visibility = mtx::requests::Visibility::Private; } else { @@ -121,7 +121,7 @@ CreateRoom::CreateRoom(QWidget *parent) connect(presetCombo_, static_cast(&QComboBox::activated), - [=](const QString &text) { + [this](const QString &text) { if (text == "Private Chat") { request_.preset = mtx::requests::Preset::PrivateChat; } else if (text == "Public Chat") { @@ -131,7 +131,7 @@ CreateRoom::CreateRoom(QWidget *parent) } }); - connect(directToggle_, &Toggle::toggled, this, [=](bool isDisabled) { + connect(directToggle_, &Toggle::toggled, this, [this](bool isDisabled) { request_.is_direct = !isDisabled; }); } diff --git a/src/dialogs/InviteUsers.cc b/src/dialogs/InviteUsers.cc index d46ca17e..71cfdf20 100644 --- a/src/dialogs/InviteUsers.cc +++ b/src/dialogs/InviteUsers.cc @@ -63,7 +63,7 @@ InviteUsers::InviteUsers(QWidget *parent) layout->addLayout(buttonLayout); connect(inviteeInput_, &TextField::returnPressed, this, &InviteUsers::addUser); - connect(confirmBtn_, &QPushButton::clicked, [=]() { + connect(confirmBtn_, &QPushButton::clicked, [this]() { emit closing(true, invitedUsers()); inviteeInput_->clear(); @@ -71,7 +71,7 @@ InviteUsers::InviteUsers(QWidget *parent) errorLabel_->hide(); }); - connect(cancelBtn_, &QPushButton::clicked, [=]() { + connect(cancelBtn_, &QPushButton::clicked, [this]() { QStringList emptyList; emit closing(false, emptyList); diff --git a/src/dialogs/JoinRoom.cc b/src/dialogs/JoinRoom.cc index 51f7d53c..d6e83014 100644 --- a/src/dialogs/JoinRoom.cc +++ b/src/dialogs/JoinRoom.cc @@ -44,11 +44,11 @@ JoinRoom::JoinRoom(QWidget *parent) layout->addLayout(buttonLayout); // TODO: input validation with error messages. - connect(confirmBtn_, &QPushButton::clicked, [=]() { + connect(confirmBtn_, &QPushButton::clicked, [this]() { emit closing(true, roomInput_->text()); roomInput_->clear(); }); - connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false, ""); }); + connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false, ""); }); } void diff --git a/src/dialogs/LeaveRoom.cc b/src/dialogs/LeaveRoom.cc index 6a8447d4..508353c6 100644 --- a/src/dialogs/LeaveRoom.cc +++ b/src/dialogs/LeaveRoom.cc @@ -42,8 +42,8 @@ LeaveRoom::LeaveRoom(QWidget *parent) layout->addWidget(label); layout->addLayout(buttonLayout); - connect(confirmBtn_, &QPushButton::clicked, [=]() { emit closing(true); }); - connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false); }); + connect(confirmBtn_, &QPushButton::clicked, [this]() { emit closing(true); }); + connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false); }); } void diff --git a/src/dialogs/Logout.cc b/src/dialogs/Logout.cc index f4752b0a..99913b04 100644 --- a/src/dialogs/Logout.cc +++ b/src/dialogs/Logout.cc @@ -60,8 +60,8 @@ Logout::Logout(QWidget *parent) layout->addWidget(label); layout->addLayout(buttonLayout); - connect(confirmBtn_, &QPushButton::clicked, [=]() { emit closing(true); }); - connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false); }); + connect(confirmBtn_, &QPushButton::clicked, [this]() { emit closing(true); }); + connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false); }); } void diff --git a/src/dialogs/PreviewUploadOverlay.cc b/src/dialogs/PreviewUploadOverlay.cc index c535609f..3c44e911 100644 --- a/src/dialogs/PreviewUploadOverlay.cc +++ b/src/dialogs/PreviewUploadOverlay.cc @@ -51,7 +51,7 @@ PreviewUploadOverlay::PreviewUploadOverlay(QWidget *parent) vlayout->addWidget(&fileName_); vlayout->addLayout(hlayout); - connect(&upload_, &QPushButton::clicked, [&]() { + connect(&upload_, &QPushButton::clicked, [this]() { emit confirmUpload(data_, mediaType_, fileName_.text()); close(); }); diff --git a/src/dialogs/ReadReceipts.cc b/src/dialogs/ReadReceipts.cc index be79c7aa..3615d62e 100644 --- a/src/dialogs/ReadReceipts.cc +++ b/src/dialogs/ReadReceipts.cc @@ -51,7 +51,7 @@ ReceiptItem::ReceiptItem(QWidget *parent, const QString &user_id, uint64_t times topLayout_->addWidget(avatar_); topLayout_->addLayout(textLayout_, 1); - AvatarProvider::resolve(user_id, [=](const QImage &img) { avatar_->setImage(img); }); + AvatarProvider::resolve(user_id, [this](const QImage &img) { avatar_->setImage(img); }); } QString -- cgit 1.5.1