From ad0734acee6e3490e6b57f01cacfc233ff7e44c8 Mon Sep 17 00:00:00 2001 From: Mathieu Vaillancourt Date: Fri, 18 Apr 2014 18:34:03 -0400 Subject: Remove unused QTableView --- src/citra_qt/debugger/disassembler.cpp | 21 ++------------------- src/citra_qt/debugger/disassembler.ui | 10 ---------- src/citra_qt/ui_disassembler.h | 8 -------- 3 files changed, 2 insertions(+), 37 deletions(-) (limited to 'src/citra_qt') diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index cc4cb13f..ccc83abf 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -23,7 +23,7 @@ DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread& emu_thread) : model = new QStandardItemModel(this); model->setColumnCount(3); disasm_ui.treeView->setModel(model); - disasm_ui.tableView->setModel(model); + RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut); RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), 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(1); 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); disasm_ui.treeView->scrollTo(model_index); 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() @@ -138,10 +132,6 @@ void DisassemblerWidget::OnCPUStepped() QModelIndex model_index = model->index(index, 0); disasm_ui.treeView->scrollTo(model_index); 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() @@ -151,11 +141,4 @@ int DisassemblerWidget::SelectedRow() return -1; return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row(); -} -/* -void DisassemblerWidget::paintEvent() -{ - QPainter painter(this); - painter.drawRect(10, 10, 50, 50); -} -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/src/citra_qt/debugger/disassembler.ui b/src/citra_qt/debugger/disassembler.ui index e65b0aa9..bd0752aa 100644 --- a/src/citra_qt/debugger/disassembler.ui +++ b/src/citra_qt/debugger/disassembler.ui @@ -70,16 +70,6 @@ - - - - true - - - false - - - diff --git a/src/citra_qt/ui_disassembler.h b/src/citra_qt/ui_disassembler.h index a0230fe9..cc9f6b54 100644 --- a/src/citra_qt/ui_disassembler.h +++ b/src/citra_qt/ui_disassembler.h @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +35,6 @@ public: QPushButton *pushButton; QPushButton *button_breakpoint; QTreeView *treeView; - QTableView *tableView; void setupUi(QDockWidget *DockWidget) { @@ -86,12 +84,6 @@ public: verticalLayout->addWidget(treeView); - tableView = new QTableView(dockWidgetContents); - tableView->setObjectName(QString::fromUtf8("tableView")); - tableView->setAlternatingRowColors(true); - - verticalLayout->addWidget(tableView); - DockWidget->setWidget(dockWidgetContents); retranslateUi(DockWidget); -- cgit v1.2.3