diff options
Diffstat (limited to 'src/citra_qt/debugger')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_cmdlists.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_surface.cpp | 11 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/ramview.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.cpp | 3 |
8 files changed, 14 insertions, 24 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index a87046acb..db266b506 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp | |||
| @@ -78,8 +78,7 @@ void CallstackWidget::OnDebugModeEntered() { | |||
| 78 | } | 78 | } |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | void CallstackWidget::OnDebugModeLeft() { | 81 | void CallstackWidget::OnDebugModeLeft() {} |
| 82 | } | ||
| 83 | 82 | ||
| 84 | void CallstackWidget::Clear() { | 83 | void CallstackWidget::Clear() { |
| 85 | for (int row = 0; row < callstack_model->rowCount(); row++) { | 84 | for (int row = 0; row < callstack_model->rowCount(); row++) { |
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index b523fe9a7..803e8b172 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp | |||
| @@ -19,8 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | DisassemblerModel::DisassemblerModel(QObject* parent) | 20 | DisassemblerModel::DisassemblerModel(QObject* parent) |
| 21 | : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), | 21 | : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), |
| 22 | selection(QModelIndex()) { | 22 | selection(QModelIndex()) {} |
| 23 | } | ||
| 24 | 23 | ||
| 25 | int DisassemblerModel::columnCount(const QModelIndex& parent) const { | 24 | int DisassemblerModel::columnCount(const QModelIndex& parent) const { |
| 26 | return 3; | 25 | return 3; |
| @@ -241,8 +240,7 @@ void DisassemblerWidget::OnDebugModeEntered() { | |||
| 241 | model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); | 240 | model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); |
| 242 | } | 241 | } |
| 243 | 242 | ||
| 244 | void DisassemblerWidget::OnDebugModeLeft() { | 243 | void DisassemblerWidget::OnDebugModeLeft() {} |
| 245 | } | ||
| 246 | 244 | ||
| 247 | int DisassemblerWidget::SelectedRow() { | 245 | int DisassemblerWidget::SelectedRow() { |
| 248 | QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex(); | 246 | QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex(); |
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index 953840e7f..b31eba533 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent) | 16 | BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent) |
| 17 | : QAbstractListModel(parent), context_weak(debug_context), | 17 | : QAbstractListModel(parent), context_weak(debug_context), |
| 18 | at_breakpoint(debug_context->at_breakpoint), | 18 | at_breakpoint(debug_context->at_breakpoint), |
| 19 | active_breakpoint(debug_context->active_breakpoint) { | 19 | active_breakpoint(debug_context->active_breakpoint) {} |
| 20 | } | ||
| 21 | 20 | ||
| 22 | int BreakPointModel::columnCount(const QModelIndex& parent) const { | 21 | int BreakPointModel::columnCount(const QModelIndex& parent) const { |
| 23 | return 1; | 22 | return 1; |
| @@ -42,7 +41,8 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const { | |||
| 42 | {Pica::DebugContext::Event::IncomingDisplayTransfer, | 41 | {Pica::DebugContext::Event::IncomingDisplayTransfer, |
| 43 | tr("Incoming display transfer")}, | 42 | tr("Incoming display transfer")}, |
| 44 | {Pica::DebugContext::Event::GSPCommandProcessed, tr("GSP command processed")}, | 43 | {Pica::DebugContext::Event::GSPCommandProcessed, tr("GSP command processed")}, |
| 45 | {Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped")}}; | 44 | {Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped")}, |
| 45 | }; | ||
| 46 | 46 | ||
| 47 | DEBUG_ASSERT(map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); | 47 | DEBUG_ASSERT(map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); |
| 48 | return (map.find(event) != map.end()) ? map.at(event) : QString(); | 48 | return (map.find(event) != map.end()) ? map.at(event) : QString(); |
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index daf1cf1de..b088ad29d 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp | |||
| @@ -51,8 +51,7 @@ public: | |||
| 51 | } | 51 | } |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent) { | 54 | GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent) {} |
| 55 | } | ||
| 56 | 55 | ||
| 57 | int GPUCommandListModel::rowCount(const QModelIndex& parent) const { | 56 | int GPUCommandListModel::rowCount(const QModelIndex& parent) const { |
| 58 | return static_cast<int>(pica_trace.writes.size()); | 57 | return static_cast<int>(pica_trace.writes.size()); |
diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics_surface.cpp index 839fca124..bb998acc4 100644 --- a/src/citra_qt/debugger/graphics_surface.cpp +++ b/src/citra_qt/debugger/graphics_surface.cpp | |||
| @@ -25,10 +25,8 @@ | |||
| 25 | #include "video_core/utils.h" | 25 | #include "video_core/utils.h" |
| 26 | 26 | ||
| 27 | SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_) | 27 | SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_) |
| 28 | : QLabel(parent), surface_widget(surface_widget_) { | 28 | : QLabel(parent), surface_widget(surface_widget_) {} |
| 29 | } | 29 | SurfacePicture::~SurfacePicture() {} |
| 30 | SurfacePicture::~SurfacePicture() { | ||
| 31 | } | ||
| 32 | 30 | ||
| 33 | void SurfacePicture::mousePressEvent(QMouseEvent* event) { | 31 | void SurfacePicture::mousePressEvent(QMouseEvent* event) { |
| 34 | // Only do something while the left mouse button is held down | 32 | // Only do something while the left mouse button is held down |
| @@ -707,9 +705,8 @@ unsigned int GraphicsSurfaceWidget::NibblesPerPixel(GraphicsSurfaceWidget::Forma | |||
| 707 | case Format::D16: | 705 | case Format::D16: |
| 708 | return 2 * 2; | 706 | return 2 * 2; |
| 709 | default: | 707 | default: |
| 710 | UNREACHABLE_MSG("GraphicsSurfaceWidget::BytesPerPixel: this " | 708 | UNREACHABLE_MSG("GraphicsSurfaceWidget::BytesPerPixel: this should not be reached as this " |
| 711 | "should not be reached as this function should " | 709 | "function should be given a format which is in " |
| 712 | "be given a format which is in " | ||
| 713 | "GraphicsSurfaceWidget::Format. Instead got %i", | 710 | "GraphicsSurfaceWidget::Format. Instead got %i", |
| 714 | static_cast<int>(format)); | 711 | static_cast<int>(format)); |
| 715 | return 0; | 712 | return 0; |
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index c49327f9c..0f02bc3da 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp | |||
| @@ -29,8 +29,7 @@ using nihstro::SourceRegister; | |||
| 29 | using nihstro::SwizzlePattern; | 29 | using nihstro::SwizzlePattern; |
| 30 | 30 | ||
| 31 | GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent) | 31 | GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent) |
| 32 | : QAbstractTableModel(parent), par(parent) { | 32 | : QAbstractTableModel(parent), par(parent) {} |
| 33 | } | ||
| 34 | 33 | ||
| 35 | int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const { | 34 | int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const { |
| 36 | return 3; | 35 | return 3; |
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp index 63f2850e1..10a09dda8 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp | |||
| @@ -4,8 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include "citra_qt/debugger/ramview.h" | 5 | #include "citra_qt/debugger/ramview.h" |
| 6 | 6 | ||
| 7 | GRamView::GRamView(QWidget* parent) : QHexEdit(parent) { | 7 | GRamView::GRamView(QWidget* parent) : QHexEdit(parent) {} |
| 8 | } | ||
| 9 | 8 | ||
| 10 | void GRamView::OnCPUStepped() { | 9 | void GRamView::OnCPUStepped() { |
| 11 | // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams... | 10 | // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams... |
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 82da0022f..87c8c3418 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp | |||
| @@ -75,8 +75,7 @@ void RegistersWidget::OnDebugModeEntered() { | |||
| 75 | UpdateVFPSystemRegisterValues(); | 75 | UpdateVFPSystemRegisterValues(); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | void RegistersWidget::OnDebugModeLeft() { | 78 | void RegistersWidget::OnDebugModeLeft() {} |
| 79 | } | ||
| 80 | 79 | ||
| 81 | void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) { | 80 | void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) { |
| 82 | setEnabled(true); | 81 | setEnabled(true); |