franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused QTableView

This commit is contained in:
Mathieu Vaillancourt 2014-04-18 18:34:03 -04:00
parent e5f09b8be6
commit ad0734acee
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread& emu_thread) :
model = new QStandardItemModel(this); model = new QStandardItemModel(this);
model->setColumnCount(3); model->setColumnCount(3);
disasm_ui.treeView->setModel(model); disasm_ui.treeView->setModel(model);
disasm_ui.tableView->setModel(model);
RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut); RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut);
RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), Qt::ApplicationShortcut); RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), Qt::ApplicationShortcut);
RegisterHotkey("Disassembler", "Step into", QKeySequence(Qt::Key_F11), Qt::ApplicationShortcut); RegisterHotkey("Disassembler", "Step into", QKeySequence(Qt::Key_F11), Qt::ApplicationShortcut);
@ -65,16 +65,10 @@ void DisassemblerWidget::Init()
disasm_ui.treeView->resizeColumnToContents(0); disasm_ui.treeView->resizeColumnToContents(0);
disasm_ui.treeView->resizeColumnToContents(1); disasm_ui.treeView->resizeColumnToContents(1);
disasm_ui.treeView->resizeColumnToContents(2); disasm_ui.treeView->resizeColumnToContents(2);
disasm_ui.tableView->resizeColumnToContents(0);
disasm_ui.tableView->resizeColumnToContents(1);
disasm_ui.tableView->resizeColumnToContents(2);
QModelIndex model_index = model->index(0, 0); QModelIndex model_index = model->index(0, 0);
disasm_ui.treeView->scrollTo(model_index); disasm_ui.treeView->scrollTo(model_index);
disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
disasm_ui.tableView->scrollTo(model_index);
disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
} }
void DisassemblerWidget::OnSetBreakpoint() void DisassemblerWidget::OnSetBreakpoint()
@ -138,10 +132,6 @@ void DisassemblerWidget::OnCPUStepped()
QModelIndex model_index = model->index(index, 0); QModelIndex model_index = model->index(index, 0);
disasm_ui.treeView->scrollTo(model_index); disasm_ui.treeView->scrollTo(model_index);
disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
disasm_ui.tableView->scrollTo(model_index);
disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
disasm_ui.tableView->selectionModel()->select(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
} }
int DisassemblerWidget::SelectedRow() int DisassemblerWidget::SelectedRow()
@ -151,11 +141,4 @@ int DisassemblerWidget::SelectedRow()
return -1; return -1;
return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row(); return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row();
} }
/*
void DisassemblerWidget::paintEvent()
{
QPainter painter(this);
painter.drawRect(10, 10, 50, 50);
}
*/

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

@ -70,16 +70,6 @@
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item>
<widget class="QTableView" name="tableView">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

8
src/citra_qt/ui_disassembler.h
View File

@ -17,7 +17,6 @@
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtGui/QPushButton> #include <QtGui/QPushButton>
#include <QtGui/QTableView>
#include <QtGui/QTreeView> #include <QtGui/QTreeView>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include <QtGui/QWidget> #include <QtGui/QWidget>
@ -36,7 +35,6 @@ public:
QPushButton *pushButton; QPushButton *pushButton;
QPushButton *button_breakpoint; QPushButton *button_breakpoint;
QTreeView *treeView; QTreeView *treeView;
QTableView *tableView;
void setupUi(QDockWidget *DockWidget) void setupUi(QDockWidget *DockWidget)
{ {
@ -86,12 +84,6 @@ public:
verticalLayout->addWidget(treeView); verticalLayout->addWidget(treeView);
tableView = new QTableView(dockWidgetContents);
tableView->setObjectName(QString::fromUtf8("tableView"));
tableView->setAlternatingRowColors(true);
verticalLayout->addWidget(tableView);
DockWidget->setWidget(dockWidgetContents); DockWidget->setWidget(dockWidgetContents);
retranslateUi(DockWidget); retranslateUi(DockWidget);