mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-21 09:49:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13842 from Dentomologist/memorywidget_fix_build_breakage_from_conflicting_prs

Browse source 
MemoryWidget: Fix build breakage from conflicting PRs
This commit is contained in:
Jordan Woyak 2025-08-01 18:03:40 -05:00 • committed by GitHub
commit cc3a13d4e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
View file

@ -836,7 +836,7 @@ void MemoryWidget::OnSetValueFromFile()
void MemoryWidget::RefreshLabelBox() void MemoryWidget::RefreshLabelBox()
{ {
if (!m_labels_visible || (m_ppc_symbol_db.Notes().empty() && m_ppc_symbol_db.IsEmpty())) if (!m_labels_visible || m_ppc_symbol_db.IsEmpty())
{ {
m_labels_group->hide(); m_labels_group->hide();
return; return;
@ -874,30 +874,29 @@ void MemoryWidget::UpdateSymbols()
m_symbols_list->clear(); m_symbols_list->clear();
m_data_list->clear(); m_data_list->clear();
for (const auto& symbol : m_ppc_symbol_db.Symbols()) m_ppc_symbol_db.ForEachSymbol([&](const Common::Symbol& symbol) {
{ QString name = QString::fromStdString(symbol.name);
QString name = QString::fromStdString(symbol.second.name);
// If the symbol has an object name, add it to the entry name. // If the symbol has an object name, add it to the entry name.
if (!symbol.second.object_name.empty()) if (!symbol.object_name.empty())
{ {
name += QString::fromStdString(fmt::format(" ({})", symbol.second.object_name)); name += QString::fromStdString(fmt::format(" ({})", symbol.object_name));
} }
auto* item = new QListWidgetItem(name); auto* item = new QListWidgetItem(name);
if (name == selection) if (name == selection)
item->setSelected(true); item->setSelected(true);
item->setData(Qt::UserRole, symbol.second.address); item->setData(Qt::UserRole, symbol.address);
if (!name.contains(m_search_labels->text(), Qt::CaseInsensitive)) if (!name.contains(m_search_labels->text(), Qt::CaseInsensitive))
continue; return;
if (symbol.second.type != Common::Symbol::Type::Function) if (symbol.type != Common::Symbol::Type::Function)
m_data_list->addItem(item); m_data_list->addItem(item);
else else
m_symbols_list->addItem(item); m_symbols_list->addItem(item);
} });
m_symbols_list->sortItems(); m_symbols_list->sortItems();
} }
@ -910,20 +909,19 @@ void MemoryWidget::UpdateNotes()
m_note_list->selectedItems()[0]->text(); m_note_list->selectedItems()[0]->text();
m_note_list->clear(); m_note_list->clear();
for (const auto& note : m_ppc_symbol_db.Notes()) m_ppc_symbol_db.ForEachNote([&](const Common::Note& note) {
{ const QString name = QString::fromStdString(note.name);
const QString name = QString::fromStdString(note.second.name);
auto* item = new QListWidgetItem(name); auto* item = new QListWidgetItem(name);
if (name == selection) if (name == selection)
item->setSelected(true); item->setSelected(true);
item->setData(Qt::UserRole, note.second.address); item->setData(Qt::UserRole, note.address);
// Filter notes based on the search text. // Filter notes based on the search text.
if (name.contains(m_search_labels->text(), Qt::CaseInsensitive)) if (name.contains(m_search_labels->text(), Qt::CaseInsensitive))
m_note_list->addItem(item); m_note_list->addItem(item);
} });
m_note_list->sortItems(); m_note_list->sortItems();
} }