feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PeripheralRegisterHandler: Drop unneeded if condition

Browse Source 
Amends 53e8f8c761

Change-Id: Ic27941cd2cb6725a7cd97f1ea5ea73bd4bc44ad0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-20 18:35:08 +02:00
parent 2d8ae7bbd9
commit 91f4ee7644
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/debugger/peripheralregisterhandler.cpp
View File

@@ -936,30 +936,28 @@ QMenu *PeripheralRegisterHandler::createRegisterFieldFormatMenu(
void PeripheralRegisterHandler::setActiveGroup(const QString &groupName)
{
deactivateGroups();
if (const auto act = qobject_cast<QAction *>(sender())) {
const auto groupEnd = m_peripheralRegisterGroups.end();
const auto groupIt = std::find_if(
m_peripheralRegisterGroups.begin(), groupEnd,
[groupName](const PeripheralRegisterGroup &group){
return group.name == groupName;
});
if (groupIt == groupEnd)
return; // Group not found.
// Set active group.
groupIt->active = true;
const auto groupEnd = m_peripheralRegisterGroups.end();
const auto groupIt = std::find_if(
m_peripheralRegisterGroups.begin(), groupEnd,
[groupName](const PeripheralRegisterGroup &group){
return group.name == groupName;
});
if (groupIt == groupEnd)
return; // Group not found.
// Set active group.
groupIt->active = true;
// Add all register items of active register group.
m_activeRegisters.reserve(groupIt->registers.count());
for (PeripheralRegister &reg : groupIt->registers) {
const auto item = new PeripheralRegisterItem(m_engine, *groupIt, reg);
rootItem()->appendChild(item);
// Add all register items of active register group.
m_activeRegisters.reserve(groupIt->registers.count());
for (PeripheralRegister &reg : groupIt->registers) {
const auto item = new PeripheralRegisterItem(m_engine, *groupIt, reg);
rootItem()->appendChild(item);
const quint64 address = reg.address(groupIt->baseAddress);
m_activeRegisters.insert(address, item);
}
m_engine->reloadPeripheralRegisters();
const quint64 address = reg.address(groupIt->baseAddress);
m_activeRegisters.insert(address, item);
}
m_engine->reloadPeripheralRegisters();
}
void PeripheralRegisterHandler::deactivateGroups()