diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp index 99c0caf67e..75cafdd814 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp @@ -973,11 +973,6 @@ void MemoryViewWidget::SetAddress(u32 address) UpdateDispatcher(UpdateType::Addresses); } -u32 MemoryViewWidget::GetAddress() -{ - return m_address; -} - void MemoryViewWidget::SetBPLoggingEnabled(bool enabled) { m_do_log = enabled; diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.h b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.h index 560decb0c1..29d006f7db 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.h +++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.h @@ -97,7 +97,6 @@ public: void SetHighlightColor(); void SetBPType(BPType type); void SetAddress(u32 address); - u32 GetAddress(); void SetFocus() const; void SetBPLoggingEnabled(bool enabled); diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp index 3efe70721d..b652a939a8 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp @@ -366,13 +366,11 @@ void MemoryWidget::ConnectWidgets() { connect(radio, &QRadioButton::toggled, this, &MemoryWidget::OnAddressSpaceChanged); } - for (auto* combo : {m_display_combo, m_align_combo, m_row_length_combo, m_find_align}) + for (auto* combo : {m_display_combo, m_align_combo, m_row_length_combo}) { connect(combo, &QComboBox::currentIndexChanged, this, &MemoryWidget::OnDisplayChanged); } - connect(m_find_auto_mem_bp, &QCheckBox::toggled, this, &MemoryWidget::OnDisplayChanged); - connect(m_find_auto_code_bp, &QCheckBox::toggled, this, &MemoryWidget::OnDisplayChanged); connect(m_dual_check, &QCheckBox::toggled, this, &MemoryWidget::OnDisplayChanged); for (auto* radio : {m_bp_read_write, m_bp_read_only, m_bp_write_only}) @@ -936,15 +934,15 @@ void MemoryWidget::OnFindNextValue() while (FindValue(true)) { - if ((alignment == 0) || ((m_memory_view->GetAddress() & (alignment - 1)) == 0)) + if ((alignment == 0) || ((GetTargetAddress().address & (alignment - 1)) == 0)) { if (set_mem_bp) { - m_memory_view->ToggleBreakpoint(m_memory_view->GetAddress(), false); + m_memory_view->ToggleBreakpoint(GetTargetAddress().address, false); } if (set_code_bp && (4 <= alignment)) { - m_system.GetPowerPC().GetBreakPoints().ToggleBreakPoint(m_memory_view->GetAddress()); + m_system.GetPowerPC().GetBreakPoints().ToggleBreakPoint(GetTargetAddress().address); emit Host::GetInstance()->PPCBreakpointsChanged(); } break; diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.h b/Source/Core/DolphinQt/Debugger/MemoryWidget.h index 034559c274..61daacea9d 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.h +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.h @@ -60,7 +60,6 @@ private: void OnBPTypeChanged(); void OnSearchAddress(); - void OnBreakOnAll(); void OnFindNextValue(); void OnFindPreviousValue();