citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #534 from neobrain/disassembler-improvements 

Disassembler improvements
This commit is contained in:
Tony Wasserka 2015-02-03 22:12:17 +01:00
parent c8103127d7 5a90420c0b
commit a45175ee0d
3 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/citra_qt/debugger/disassembler.cpp
View File

@ -17,16 +17,9 @@
#include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/disassembler/arm_disasm.h" #include "core/arm/disassembler/arm_disasm.h"
DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
} DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
QModelIndex DisassemblerModel::index(int row, int column, const QModelIndex& parent) const {
return createIndex(row, column);
}
QModelIndex DisassemblerModel::parent(const QModelIndex& child) const {
return QModelIndex();
} }
int DisassemblerModel::columnCount(const QModelIndex& parent) const { int DisassemblerModel::columnCount(const QModelIndex& parent) const {

9
src/citra_qt/debugger/disassembler.h
View File

@ -2,8 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QAbstractItemModel> #pragma once
#include <QAbstractListModel>
#include <QDockWidget> #include <QDockWidget>
#include "ui_disassembler.h" #include "ui_disassembler.h"
#include "common/common.h" #include "common/common.h"
@ -12,15 +15,13 @@
class QAction; class QAction;
class EmuThread; class EmuThread;
class DisassemblerModel : public QAbstractItemModel class DisassemblerModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
DisassemblerModel(QObject* parent); DisassemblerModel(QObject* parent);
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex& child) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

3
src/citra_qt/debugger/disassembler.ui
View File

@ -65,6 +65,9 @@
<property name="rootIsDecorated"> <property name="rootIsDecorated">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>