diff options
| author | 2015-02-03 20:45:33 +0100 | |
|---|---|---|
| committer | 2015-02-03 21:11:49 +0100 | |
| commit | 79713d500b14ed3c71a632009c3ed8a6c2e68406 (patch) | |
| tree | c19fa1b5bd52a89574e8bb28b5c5502ae862b2b3 | |
| parent | Merge pull request #483 from yuriks/cmake-fix (diff) | |
| download | yuzu-79713d500b14ed3c71a632009c3ed8a6c2e68406.tar.gz yuzu-79713d500b14ed3c71a632009c3ed8a6c2e68406.tar.xz yuzu-79713d500b14ed3c71a632009c3ed8a6c2e68406.zip | |
citra-qt: Fix a crash when double-clicking a disassembler list item.
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 9 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.h | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index c61ace925..54d21dc90 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp | |||
| @@ -17,16 +17,9 @@ | |||
| 17 | #include "core/arm/skyeye_common/armdefs.h" | 17 | #include "core/arm/skyeye_common/armdefs.h" |
| 18 | #include "core/arm/disassembler/arm_disasm.h" | 18 | #include "core/arm/disassembler/arm_disasm.h" |
| 19 | 19 | ||
| 20 | DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) { | ||
| 21 | 20 | ||
| 22 | } | 21 | DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) { |
| 23 | |||
| 24 | QModelIndex DisassemblerModel::index(int row, int column, const QModelIndex& parent) const { | ||
| 25 | return createIndex(row, column); | ||
| 26 | } | ||
| 27 | 22 | ||
| 28 | QModelIndex DisassemblerModel::parent(const QModelIndex& child) const { | ||
| 29 | return QModelIndex(); | ||
| 30 | } | 23 | } |
| 31 | 24 | ||
| 32 | int DisassemblerModel::columnCount(const QModelIndex& parent) const { | 25 | int DisassemblerModel::columnCount(const QModelIndex& parent) const { |
diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h index 0deccc240..5e19d7c51 100644 --- a/src/citra_qt/debugger/disassembler.h +++ b/src/citra_qt/debugger/disassembler.h | |||
| @@ -2,8 +2,11 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <QAbstractItemModel> | 5 | #pragma once |
| 6 | |||
| 7 | #include <QAbstractListModel> | ||
| 6 | #include <QDockWidget> | 8 | #include <QDockWidget> |
| 9 | |||
| 7 | #include "ui_disassembler.h" | 10 | #include "ui_disassembler.h" |
| 8 | 11 | ||
| 9 | #include "common/common.h" | 12 | #include "common/common.h" |
| @@ -12,15 +15,13 @@ | |||
| 12 | class QAction; | 15 | class QAction; |
| 13 | class EmuThread; | 16 | class EmuThread; |
| 14 | 17 | ||
| 15 | class DisassemblerModel : public QAbstractItemModel | 18 | class DisassemblerModel : public QAbstractListModel |
| 16 | { | 19 | { |
| 17 | Q_OBJECT | 20 | Q_OBJECT |
| 18 | 21 | ||
| 19 | public: | 22 | public: |
| 20 | DisassemblerModel(QObject* parent); | 23 | DisassemblerModel(QObject* parent); |
| 21 | 24 | ||
| 22 | QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; | ||
| 23 | QModelIndex parent(const QModelIndex& child) const override; | ||
| 24 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; | 25 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; |
| 25 | int rowCount(const QModelIndex& parent = QModelIndex()) const override; | 26 | int rowCount(const QModelIndex& parent = QModelIndex()) const override; |
| 26 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; | 27 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; |