From b662a173bd91edac0419490498bcd2ce1ab0793d Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 18 Nov 2019 05:25:28 +1100 Subject: missed a couple of Mac debugger things (nw) --- src/osd/modules/debugger/osx/disassemblyview.mm | 26 ++++++++++++------------- src/osd/modules/debugger/osx/memoryview.mm | 26 ++++++++++++------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/osd/modules/debugger/osx/disassemblyview.mm b/src/osd/modules/debugger/osx/disassemblyview.mm index f958d793b47..13c76aee2a5 100644 --- a/src/osd/modules/debugger/osx/disassemblyview.mm +++ b/src/osd/modules/debugger/osx/disassemblyview.mm @@ -46,7 +46,7 @@ - (NSSize)maximumFrameSize { debug_view_xy max(0, 0); debug_view_source const *source = view->source(); - for (debug_view_source const *source = view->first_source(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { view->set_source(*source); debug_view_xy const current = view->total_size(); @@ -155,23 +155,21 @@ - (BOOL)selectSubviewForSpace:(address_space *)space { if (space == nullptr) return NO; - debug_view_disasm_source const *source = downcast(view->first_source()); - while ((source != nullptr) && (&source->space() != space)) - source = downcast(source->next()); - if (source != nullptr) + for (auto &ptr : view->source_list()) { - if (view->source() != source) + debug_view_disasm_source const *const source = downcast(ptr.get()); + if (&source->space() == space) { - view->set_source(*source); - if ([[self window] firstResponder] != self) - view->set_cursor_visible(false); + if (view->source() != source) + { + view->set_source(*source); + if ([[self window] firstResponder] != self) + view->set_cursor_visible(false); + } + return YES; } - return YES; - } - else - { - return NO; } + return NO; } diff --git a/src/osd/modules/debugger/osx/memoryview.mm b/src/osd/modules/debugger/osx/memoryview.mm index 594e32e0fd7..49d3f7b2df6 100644 --- a/src/osd/modules/debugger/osx/memoryview.mm +++ b/src/osd/modules/debugger/osx/memoryview.mm @@ -68,7 +68,7 @@ - (NSSize)maximumFrameSize { debug_view_xy max(0, 0); debug_view_source const *source = view->source(); - for (debug_view_source const *source = view->first_source(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { view->set_source(*source); debug_view_xy const current = view->total_size(); @@ -139,23 +139,21 @@ - (BOOL)selectSubviewForSpace:(address_space *)space { if (space == nullptr) return NO; - debug_view_memory_source const *source = downcast(view->first_source()); - while ((source != nullptr) && (source->space() != space)) - source = downcast(source->next()); - if (source != nullptr) + for (auto &ptr : view->source_list()) { - if (view->source() != source) + debug_view_memory_source const *const source = downcast(ptr.get()); + if (&source->space() == space) { - view->set_source(*source); - if ([[self window] firstResponder] != self) - view->set_cursor_visible(false); + if (view->source() != source) + { + view->set_source(*source); + if ([[self window] firstResponder] != self) + view->set_cursor_visible(false); + } + return YES; } - return YES; - } - else - { - return NO; } + return NO; } -- cgit v1.2.3