diff options
author | bunnei <bunneidev@gmail.com> | 2015-05-01 01:46:50 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-05-02 00:35:51 +0200 |
commit | bc41de2131728192e3fd4c8c83e8b2d6e5ba4530 (patch) | |
tree | 03a92c76eb03070dd6748f1b1dbb13efb68d4af0 /src/citra_qt/debugger | |
parent | Qt: Clear registers widget on shutdown. (diff) | |
download | yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar.gz yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar.bz2 yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar.lz yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar.xz yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.tar.zst yuzu-bc41de2131728192e3fd4c8c83e8b2d6e5ba4530.zip |
Diffstat (limited to 'src/citra_qt/debugger')
-rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/disassembler.h | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.cpp | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 6400bb856..08c6b49bd 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -241,7 +241,7 @@ int DisassemblerWidget::SelectedRow() { return disasm_ui.treeView->selectionModel()->currentIndex().row(); } -void DisassemblerWidget::OnEmulationStarted(EmuThread* emu_thread) { +void DisassemblerWidget::OnEmulationStarting(EmuThread* emu_thread) { this->emu_thread = emu_thread; model = new DisassemblerModel(this); @@ -256,7 +256,7 @@ void DisassemblerWidget::OnEmulationStarted(EmuThread* emu_thread) { setEnabled(true); } -void DisassemblerWidget::OnEmulationStopped() { +void DisassemblerWidget::OnEmulationStopping() { disasm_ui.treeView->setModel(nullptr); delete model; emu_thread = nullptr; diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h index b771e95b7..45b0a7e08 100644 --- a/src/citra_qt/debugger/disassembler.h +++ b/src/citra_qt/debugger/disassembler.h @@ -65,8 +65,8 @@ public slots: void OnDebugModeEntered(); void OnDebugModeLeft(); - void OnEmulationStarted(EmuThread* emu_thread); - void OnEmulationStopped(); + void OnEmulationStarting(EmuThread* emu_thread); + void OnEmulationStopping(); private: // returns -1 if no row is selected diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 2b1e8ceb8..5527a2afd 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -71,11 +71,11 @@ void RegistersWidget::OnDebugModeEntered() { void RegistersWidget::OnDebugModeLeft() { } -void RegistersWidget::OnEmulationStarted(EmuThread* emu_thread) { +void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) { setEnabled(true); } -void RegistersWidget::OnEmulationStopped() { +void RegistersWidget::OnEmulationStopping() { // Reset widget text for (int i = 0; i < 16; ++i) registers->child(i)->setText(1, QString("")); diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index 0356de290..68e3fb908 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h @@ -21,8 +21,8 @@ public slots: void OnDebugModeEntered(); void OnDebugModeLeft(); - void OnEmulationStarted(EmuThread* emu_thread); - void OnEmulationStopped(); + void OnEmulationStarting(EmuThread* emu_thread); + void OnEmulationStopping(); private: Ui::ARMRegisters cpu_regs_ui; |