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

Tidying lambdas

Browse Source
This commit is contained in:
Nav
2021-10-08 23:08:15 +01:00
parent c4b8c97897
commit 356c06f4f3
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Application.hpp
View File

@@ -45,7 +45,7 @@ namespace Bloom
return std::map<std::string, std::function<std::unique_ptr<DebugServers::DebugServer>()>> { return std::map<std::string, std::function<std::unique_ptr<DebugServers::DebugServer>()>> {
{ {
"avr-gdb-rsp", "avr-gdb-rsp",
[this]() -> std::unique_ptr<DebugServers::DebugServer> { [this] () -> std::unique_ptr<DebugServers::DebugServer> {
return std::make_unique<DebugServers::Gdb::AvrGdbRsp>(this->eventManager); return std::make_unique<DebugServers::Gdb::AvrGdbRsp>(this->eventManager);
} }
}, },

4
src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
View File

@@ -100,7 +100,7 @@ void GdbRspDebugServer::handleGdbPacket(CommandPackets::ReadRegisters& packet) {
std::remove_if( std::remove_if(
registerSet.begin(), registerSet.begin(),
registerSet.end(), registerSet.end(),
[&registerNumberToDescriptorMapping](const TargetRegister& reg) { [&registerNumberToDescriptorMapping] (const TargetRegister& reg) {
return !registerNumberToDescriptorMapping.contains(reg.descriptor); return !registerNumberToDescriptorMapping.contains(reg.descriptor);
} }
), ),
@@ -114,7 +114,7 @@ void GdbRspDebugServer::handleGdbPacket(CommandPackets::ReadRegisters& packet) {
std::sort( std::sort(
registerSet.begin(), registerSet.begin(),
registerSet.end(), registerSet.end(),
[this, &registerNumberToDescriptorMapping](const TargetRegister& registerA, const TargetRegister& registerB) { [this, &registerNumberToDescriptorMapping] (const TargetRegister& registerA, const TargetRegister& registerB) {
return registerNumberToDescriptorMapping.valueAt(registerA.descriptor) < return registerNumberToDescriptorMapping.valueAt(registerA.descriptor) <
registerNumberToDescriptorMapping.valueAt(registerB.descriptor); registerNumberToDescriptorMapping.valueAt(registerB.descriptor);
} }

4
src/EventManager/EventListener.cpp
View File

@@ -29,7 +29,7 @@ void EventListener::waitAndDispatch(int msTimeout) {
auto registeredEventTypes = this->getRegisteredEventTypes(); auto registeredEventTypes = this->getRegisteredEventTypes();
std::optional<SharedGenericEventPointer> event; std::optional<SharedGenericEventPointer> event;
auto eventsFound = [&registeredEventTypes, &event, &eventQueueByType]() -> bool { auto eventsFound = [&registeredEventTypes, &event, &eventQueueByType] () -> bool {
for (auto& eventQueue: eventQueueByType) { for (auto& eventQueue: eventQueueByType) {
if (registeredEventTypes.contains(eventQueue.first) && !eventQueue.second.empty()) { if (registeredEventTypes.contains(eventQueue.first) && !eventQueue.second.empty()) {
return true; return true;
@@ -86,7 +86,7 @@ std::vector<SharedGenericEventPointer> EventListener::getEvents() {
} }
} }
std::sort(output.begin(), output.end(), [](const SharedGenericEventPointer& a, const SharedGenericEventPointer& b) { std::sort(output.begin(), output.end(), [] (const SharedGenericEventPointer& a, const SharedGenericEventPointer& b) {
return a->id < b->id; return a->id < b->id;
}); });

4
src/EventManager/EventListener.hpp
View File

@@ -107,7 +107,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));
} }
@@ -242,7 +242,7 @@ namespace Bloom
} }
Events::SharedGenericEventPointer foundEvent = nullptr; Events::SharedGenericEventPointer foundEvent = nullptr;
auto eventsFound = [&eventTypes, &eventQueueByType, &correlationId, &foundEvent]() -> bool { auto eventsFound = [&eventTypes, &eventQueueByType, &correlationId, &foundEvent] () -> bool {
for (const auto& eventType : eventTypes) { for (const auto& eventType : eventTypes) {
if (eventQueueByType.find(eventType) != eventQueueByType.end() if (eventQueueByType.find(eventType) != eventQueueByType.end()
&& !eventQueueByType.find(eventType)->second.empty() && !eventQueueByType.find(eventType)->second.empty()

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

@@ -385,11 +385,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;
} }

12
src/Insight/UserInterfaces/InsightWindow/UiLoader.cpp
View File

@@ -17,7 +17,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
this->customWidgetConstructorsByWidgetName = decltype(this->customWidgetConstructorsByWidgetName) { this->customWidgetConstructorsByWidgetName = decltype(this->customWidgetConstructorsByWidgetName) {
{ {
"PanelWidget", "PanelWidget",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new PanelWidget(parent); auto widget = new PanelWidget(parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());
@@ -26,7 +26,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
}, },
{ {
"RotatableLabel", "RotatableLabel",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new RotatableLabel("", parent); auto widget = new RotatableLabel("", parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());
@@ -35,7 +35,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
}, },
{ {
"ExpandingHeightScrollAreaWidget", "ExpandingHeightScrollAreaWidget",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new ExpandingHeightScrollAreaWidget(parent); auto widget = new ExpandingHeightScrollAreaWidget(parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());
@@ -44,7 +44,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
}, },
{ {
"SvgWidget", "SvgWidget",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new SvgWidget(parent); auto widget = new SvgWidget(parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());
@@ -53,7 +53,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
}, },
{ {
"SvgToolButton", "SvgToolButton",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new SvgToolButton(parent); auto widget = new SvgToolButton(parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());
@@ -62,7 +62,7 @@ UiLoader::UiLoader(QObject* parent): QUiLoader(parent) {
}, },
{ {
"TargetPackageWidgetContainer", "TargetPackageWidgetContainer",
[this](QWidget* parent, const QString& name) { [this] (QWidget* parent, const QString& name) {
auto widget = new InsightTargetWidgets::TargetPackageWidgetContainer(parent); auto widget = new InsightTargetWidgets::TargetPackageWidgetContainer(parent);
widget->setObjectName(name); widget->setObjectName(name);
widget->setStyleSheet(parent->styleSheet()); widget->setStyleSheet(parent->styleSheet());

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

@@ -314,7 +314,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) {
@@ -352,7 +352,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

@@ -156,7 +156,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);

10
src/TargetController/TargetController.hpp
View File

@@ -102,19 +102,19 @@ namespace Bloom
static auto mapping = std::map<std::string, std::function<std::unique_ptr<DebugTool>()>> { static auto mapping = std::map<std::string, std::function<std::unique_ptr<DebugTool>()>> {
{ {
"atmel-ice", "atmel-ice",
[]() { [] {
return std::make_unique<DebugToolDrivers::AtmelIce>(); return std::make_unique<DebugToolDrivers::AtmelIce>();
} }
}, },
{ {
"power-debugger", "power-debugger",
[]() { [] {
return std::make_unique<DebugToolDrivers::PowerDebugger>(); return std::make_unique<DebugToolDrivers::PowerDebugger>();
} }
}, },
{ {
"snap", "snap",
[]() { [] {
return std::make_unique<DebugToolDrivers::MplabSnap>(); return std::make_unique<DebugToolDrivers::MplabSnap>();
} }
}, },
@@ -136,7 +136,7 @@ namespace Bloom
mapping = { mapping = {
{ {
"avr8", "avr8",
[]() { [] {
return std::make_unique<Targets::Microchip::Avr::Avr8Bit::Avr8>(); return std::make_unique<Targets::Microchip::Avr::Avr8Bit::Avr8>();
} }
}, },
@@ -158,7 +158,7 @@ namespace Bloom
if (!mapping.contains(targetName)) { if (!mapping.contains(targetName)) {
mapping.insert({ mapping.insert({
targetName, targetName,
[targetName, targetSignatureHex]() { [targetName, targetSignatureHex] {
return std::make_unique<Targets::Microchip::Avr::Avr8Bit::Avr8>( return std::make_unique<Targets::Microchip::Avr::Avr8Bit::Avr8>(
targetName, targetName,
Targets::Microchip::Avr::TargetSignature(targetSignatureHex) Targets::Microchip::Avr::TargetSignature(targetSignatureHex)

4
src/Targets/Microchip/AVR/AVR8/Avr8.cpp
View File

@@ -134,7 +134,7 @@ TargetDescriptor Avr8Bit::Avr8::getDescriptor() {
this->targetVariantsById.begin(), this->targetVariantsById.begin(),
this->targetVariantsById.end(), this->targetVariantsById.end(),
std::back_inserter(descriptor.variants), std::back_inserter(descriptor.variants),
[](auto& variantToIdPair) { [] (auto& variantToIdPair) {
return variantToIdPair.second; return variantToIdPair.second;
} }
); );
@@ -272,7 +272,7 @@ std::map<int, TargetPinState> Avr8::getPinStates(int variantId) {
* be considered when the need for it becomes apparent. * be considered when the need for it becomes apparent.
*/ */
std::map<std::uint16_t, TargetMemoryBuffer> cachedMemoryByStartAddress; std::map<std::uint16_t, TargetMemoryBuffer> cachedMemoryByStartAddress;
auto readMemoryBitset = [this, &cachedMemoryByStartAddress](std::uint16_t startAddress) { auto readMemoryBitset = [this, &cachedMemoryByStartAddress] (std::uint16_t startAddress) {
if (!cachedMemoryByStartAddress.contains(startAddress)) { if (!cachedMemoryByStartAddress.contains(startAddress)) {
cachedMemoryByStartAddress.insert( cachedMemoryByStartAddress.insert(
std::pair( std::pair(

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

@@ -37,7 +37,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);
} }
@@ -67,7 +67,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() + "\"");
} }
); );