doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidying/consistency in lambda definitions

Browse Source
This commit is contained in:
Nav
2021-10-03 02:03:54 +01:00
parent df6b94b0de
commit 508acf1c56
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/EventManager/EventListener.hpp
View File

@@ -143,7 +143,7 @@ namespace Bloom
void registerCallbackForEventType(std::function<void(const EventType&)> callback) { void registerCallbackForEventType(std::function<void(const EventType&)> callback) {
// We encapsulate the callback in a lambda to handle the downcasting. // We encapsulate the callback in a lambda to handle the downcasting.
std::function<void(const Events::Event&)> parentCallback = std::function<void(const Events::Event&)> parentCallback =
[callback] (const Events::Event& event) { [callback](const Events::Event& event) {
// Downcast the event to the expected type // Downcast the event to the expected type
callback(dynamic_cast<const EventType&>(event)); callback(dynamic_cast<const EventType&>(event));
} }

4
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -159,11 +159,11 @@ void InsightWindow::activate() {
* considered a duplicate. * considered a duplicate.
*/ */
auto processedVariants = std::vector<TargetVariant>(); auto processedVariants = std::vector<TargetVariant>();
auto isDuplicateVariant = [&processedVariants] (const TargetVariant& variantA) { auto isDuplicateVariant = [&processedVariants](const TargetVariant& variantA) {
return std::ranges::any_of( return std::ranges::any_of(
processedVariants.begin(), processedVariants.begin(),
processedVariants.end(), processedVariants.end(),
[&variantA, &processedVariants] (const TargetVariant& variantB) { [&variantA, &processedVariants](const TargetVariant& variantB) {
if (variantA.package != variantB.package) { if (variantA.package != variantB.package) {
return false; return false;
} }

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp
View File

@@ -313,7 +313,7 @@ void TargetRegisterInspectorWindow::refreshRegisterValue() {
readTargetRegisterTask, readTargetRegisterTask,
&ReadTargetRegisters::targetRegistersRead, &ReadTargetRegisters::targetRegistersRead,
this, this,
[this] (Targets::TargetRegisters targetRegisters) { [this](Targets::TargetRegisters targetRegisters) {
this->registerValueContainer->setDisabled(false); this->registerValueContainer->setDisabled(false);
for (const auto& targetRegister : targetRegisters) { for (const auto& targetRegister : targetRegisters) {
@@ -351,7 +351,7 @@ void TargetRegisterInspectorWindow::applyChanges() {
this->registerHistoryWidget->selectCurrentItem(); this->registerHistoryWidget->selectCurrentItem();
}); });
this->connect(writeRegisterTask, &InsightWorkerTask::failed, this, [this] (QString errorMessage) { this->connect(writeRegisterTask, &InsightWorkerTask::failed, this, [this](QString errorMessage) {
this->registerValueContainer->setDisabled(false); this->registerValueContainer->setDisabled(false);
auto errorDialogue = new ErrorDialogue( auto errorDialogue = new ErrorDialogue(
"Error", "Error",

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/RegisterWidget.cpp
View File

@@ -127,7 +127,7 @@ void RegisterWidget::refreshValue() {
readRegisterTask, readRegisterTask,
&ReadTargetRegisters::targetRegistersRead, &ReadTargetRegisters::targetRegistersRead,
this, this,
[this] (Targets::TargetRegisters registers) { [this](Targets::TargetRegisters registers) {
for (const auto& targetRegister : registers) { for (const auto& targetRegister : registers) {
if (targetRegister.descriptor == this->descriptor) { if (targetRegister.descriptor == this->descriptor) {
this->setRegisterValue(targetRegister); this->setRegisterValue(targetRegister);

4
src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -36,7 +36,7 @@ TargetDescriptionFile::TargetDescriptionFile(
descriptionFilesJsonArray.begin(), descriptionFilesJsonArray.begin(),
descriptionFilesJsonArray.end(), descriptionFilesJsonArray.end(),
std::back_inserter(matchingDescriptionFiles), std::back_inserter(matchingDescriptionFiles),
[&targetName] (const QJsonValue& value) { [&targetName](const QJsonValue& value) {
auto pdTargetName = value.toObject().find("targetName")->toString().toLower().toStdString(); auto pdTargetName = value.toObject().find("targetName")->toString().toLower().toStdString();
return !targetName.has_value() || (targetName.has_value() && targetName.value() == pdTargetName); return !targetName.has_value() || (targetName.has_value() && targetName.value() == pdTargetName);
} }
@@ -66,7 +66,7 @@ TargetDescriptionFile::TargetDescriptionFile(
matchingDescriptionFiles.begin(), matchingDescriptionFiles.begin(),
matchingDescriptionFiles.end(), matchingDescriptionFiles.end(),
std::back_inserter(targetNames), std::back_inserter(targetNames),
[] (const QJsonValue& descriptionFile) { [](const QJsonValue& descriptionFile) {
return QString("\"" + descriptionFile.toObject().find("targetName")->toString().toLower() + "\""); return QString("\"" + descriptionFile.toObject().find("targetName")->toString().toLower() + "\"");
} }
); );