Qt: Fixed a bug in shutdown procedure, various cleanups.

This commit is contained in:
bunnei 2015-04-30 19:46:50 -04:00
parent ad4445c529
commit bc41de2131
7 changed files with 26 additions and 35 deletions

View file

@ -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;

View file

@ -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

View file

@ -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(""));

View file

@ -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;