forked from qt-creator/qt-creator
PeripheralRegisterHandler: Drop unneeded if condition
Amends 53e8f8c761
Change-Id: Ic27941cd2cb6725a7cd97f1ea5ea73bd4bc44ad0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -936,30 +936,28 @@ QMenu *PeripheralRegisterHandler::createRegisterFieldFormatMenu(
|
|||||||
void PeripheralRegisterHandler::setActiveGroup(const QString &groupName)
|
void PeripheralRegisterHandler::setActiveGroup(const QString &groupName)
|
||||||
{
|
{
|
||||||
deactivateGroups();
|
deactivateGroups();
|
||||||
if (const auto act = qobject_cast<QAction *>(sender())) {
|
const auto groupEnd = m_peripheralRegisterGroups.end();
|
||||||
const auto groupEnd = m_peripheralRegisterGroups.end();
|
const auto groupIt = std::find_if(
|
||||||
const auto groupIt = std::find_if(
|
m_peripheralRegisterGroups.begin(), groupEnd,
|
||||||
m_peripheralRegisterGroups.begin(), groupEnd,
|
[groupName](const PeripheralRegisterGroup &group){
|
||||||
[groupName](const PeripheralRegisterGroup &group){
|
return group.name == groupName;
|
||||||
return group.name == groupName;
|
});
|
||||||
});
|
if (groupIt == groupEnd)
|
||||||
if (groupIt == groupEnd)
|
return; // Group not found.
|
||||||
return; // Group not found.
|
// Set active group.
|
||||||
// Set active group.
|
groupIt->active = true;
|
||||||
groupIt->active = true;
|
|
||||||
|
|
||||||
// Add all register items of active register group.
|
// Add all register items of active register group.
|
||||||
m_activeRegisters.reserve(groupIt->registers.count());
|
m_activeRegisters.reserve(groupIt->registers.count());
|
||||||
for (PeripheralRegister ® : groupIt->registers) {
|
for (PeripheralRegister ® : groupIt->registers) {
|
||||||
const auto item = new PeripheralRegisterItem(m_engine, *groupIt, reg);
|
const auto item = new PeripheralRegisterItem(m_engine, *groupIt, reg);
|
||||||
rootItem()->appendChild(item);
|
rootItem()->appendChild(item);
|
||||||
|
|
||||||
const quint64 address = reg.address(groupIt->baseAddress);
|
const quint64 address = reg.address(groupIt->baseAddress);
|
||||||
m_activeRegisters.insert(address, item);
|
m_activeRegisters.insert(address, item);
|
||||||
}
|
|
||||||
|
|
||||||
m_engine->reloadPeripheralRegisters();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_engine->reloadPeripheralRegisters();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PeripheralRegisterHandler::deactivateGroups()
|
void PeripheralRegisterHandler::deactivateGroups()
|
||||||
|
|||||||
Reference in New Issue
Block a user