ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger: Rename DebuggerView subclasses

This commit is contained in:
chaoticgd 2025-04-12 18:32:30 +01:00 committed by Ty
parent 252aaa500e
commit 0ffb6d6362
32 changed files with 522 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pcsx2-qt/CMakeLists.txt
View File

@ -169,29 +169,29 @@ target_sources(pcsx2-qt PRIVATE
Debugger/DebuggerWindow.cpp
Debugger/DebuggerWindow.h
Debugger/DebuggerWindow.ui
Debugger/DisassemblyWidget.cpp
Debugger/DisassemblyWidget.h
Debugger/DisassemblyWidget.ui
Debugger/DisassemblyView.cpp
Debugger/DisassemblyView.h
Debugger/DisassemblyView.ui
Debugger/JsonValueWrapper.h
Debugger/RegisterWidget.cpp
Debugger/RegisterWidget.h
Debugger/RegisterWidget.ui
Debugger/RegisterView.cpp
Debugger/RegisterView.h
Debugger/RegisterView.ui
Debugger/StackModel.cpp
Debugger/StackModel.h
Debugger/StackWidget.cpp
Debugger/StackWidget.h
Debugger/StackView.cpp
Debugger/StackView.h
Debugger/ThreadModel.cpp
Debugger/ThreadModel.h
Debugger/ThreadWidget.cpp
Debugger/ThreadWidget.h
Debugger/ThreadView.cpp
Debugger/ThreadView.h
Debugger/Breakpoints/BreakpointDialog.cpp
Debugger/Breakpoints/BreakpointDialog.h
Debugger/Breakpoints/BreakpointDialog.ui
Debugger/Breakpoints/BreakpointModel.cpp
Debugger/Breakpoints/BreakpointModel.h
Debugger/Breakpoints/BreakpointWidget.cpp
Debugger/Breakpoints/BreakpointWidget.h
Debugger/Breakpoints/BreakpointWidget.ui
Debugger/Breakpoints/BreakpointView.cpp
Debugger/Breakpoints/BreakpointView.h
Debugger/Breakpoints/BreakpointView.ui
Debugger/Docking/DockLayout.cpp
Debugger/Docking/DockLayout.h
Debugger/Docking/DockManager.cpp
@ -212,17 +212,17 @@ target_sources(pcsx2-qt PRIVATE
Debugger/Docking/NoLayoutsWidget.cpp
Debugger/Docking/NoLayoutsWidget.h
Debugger/Docking/NoLayoutsWidget.ui
Debugger/Memory/MemorySearchWidget.cpp
Debugger/Memory/MemorySearchWidget.h
Debugger/Memory/MemorySearchWidget.ui
Debugger/Memory/MemoryViewWidget.cpp
Debugger/Memory/MemoryViewWidget.h
Debugger/Memory/MemoryViewWidget.ui
Debugger/Memory/MemorySearchView.cpp
Debugger/Memory/MemorySearchView.h
Debugger/Memory/MemorySearchView.ui
Debugger/Memory/MemoryView.cpp
Debugger/Memory/MemoryView.h
Debugger/Memory/MemoryView.ui
Debugger/Memory/SavedAddressesModel.cpp
Debugger/Memory/SavedAddressesModel.h
Debugger/Memory/SavedAddressesWidget.cpp
Debugger/Memory/SavedAddressesWidget.h
Debugger/Memory/SavedAddressesWidget.ui
Debugger/Memory/SavedAddressesView.cpp
Debugger/Memory/SavedAddressesView.h
Debugger/Memory/SavedAddressesView.ui
Debugger/SymbolTree/NewSymbolDialogs.cpp
Debugger/SymbolTree/NewSymbolDialogs.h
Debugger/SymbolTree/NewSymbolDialog.ui
@ -234,9 +234,9 @@ target_sources(pcsx2-qt PRIVATE
Debugger/SymbolTree/SymbolTreeNode.h
Debugger/SymbolTree/SymbolTreeDelegates.cpp
Debugger/SymbolTree/SymbolTreeDelegates.h
Debugger/SymbolTree/SymbolTreeWidgets.cpp
Debugger/SymbolTree/SymbolTreeWidgets.h
Debugger/SymbolTree/SymbolTreeWidget.ui
Debugger/SymbolTree/SymbolTreeViews.cpp
Debugger/SymbolTree/SymbolTreeViews.h
Debugger/SymbolTree/SymbolTreeView.ui
Debugger/SymbolTree/TypeString.cpp
Debugger/SymbolTree/TypeString.h
Tools/InputRecording/NewInputRecordingDlg.cpp

36
pcsx2-qt/Debugger/Breakpoints/BreakpointWidget.cpp → pcsx2-qt/Debugger/Breakpoints/BreakpointView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "BreakpointWidget.h"
#include "BreakpointView.h"
#include "QtUtils.h"
#include "Debugger/DebuggerSettingsManager.h"
@ -10,15 +10,15 @@
#include <QtGui/QClipboard>
BreakpointWidget::BreakpointWidget(const DebuggerViewParameters& parameters)
BreakpointView::BreakpointView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, DISALLOW_MULTIPLE_INSTANCES)
, m_model(BreakpointModel::getInstance(cpu()))
{
m_ui.setupUi(this);
m_ui.breakpointList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.breakpointList, &QTableView::customContextMenuRequested, this, &BreakpointWidget::openContextMenu);
connect(m_ui.breakpointList, &QTableView::doubleClicked, this, &BreakpointWidget::onDoubleClicked);
connect(m_ui.breakpointList, &QTableView::customContextMenuRequested, this, &BreakpointView::openContextMenu);
connect(m_ui.breakpointList, &QTableView::doubleClicked, this, &BreakpointView::onDoubleClicked);
m_ui.breakpointList->setModel(m_model);
for (std::size_t i = 0; auto mode : BreakpointModel::HeaderResizeModes)
@ -28,13 +28,13 @@ BreakpointWidget::BreakpointWidget(const DebuggerViewParameters& parameters)
}
}
void BreakpointWidget::onDoubleClicked(const QModelIndex& index)
void BreakpointView::onDoubleClicked(const QModelIndex& index)
{
if (index.isValid() && index.column() == BreakpointModel::OFFSET)
goToInDisassembler(m_model->data(index, BreakpointModel::DataRole).toUInt(), true);
}
void BreakpointWidget::openContextMenu(QPoint pos)
void BreakpointView::openContextMenu(QPoint pos)
{
QMenu* menu = new QMenu(m_ui.breakpointList);
menu->setAttribute(Qt::WA_DeleteOnClose);
@ -42,23 +42,23 @@ void BreakpointWidget::openContextMenu(QPoint pos)
if (cpu().isAlive())
{
QAction* newAction = menu->addAction(tr("New"));
connect(newAction, &QAction::triggered, this, &BreakpointWidget::contextNew);
connect(newAction, &QAction::triggered, this, &BreakpointView::contextNew);
const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel();
if (selModel->hasSelection())
{
QAction* editAction = menu->addAction(tr("Edit"));
connect(editAction, &QAction::triggered, this, &BreakpointWidget::contextEdit);
connect(editAction, &QAction::triggered, this, &BreakpointView::contextEdit);
if (selModel->selectedIndexes().count() == 1)
{
QAction* copyAction = menu->addAction(tr("Copy"));
connect(copyAction, &QAction::triggered, this, &BreakpointWidget::contextCopy);
connect(copyAction, &QAction::triggered, this, &BreakpointView::contextCopy);
}
QAction* deleteAction = menu->addAction(tr("Delete"));
connect(deleteAction, &QAction::triggered, this, &BreakpointWidget::contextDelete);
connect(deleteAction, &QAction::triggered, this, &BreakpointView::contextDelete);
}
}
@ -76,7 +76,7 @@ void BreakpointWidget::openContextMenu(QPoint pos)
if (cpu().isAlive())
{
QAction* actionImport = menu->addAction(tr("Paste from CSV"));
connect(actionImport, &QAction::triggered, this, &BreakpointWidget::contextPasteCSV);
connect(actionImport, &QAction::triggered, this, &BreakpointView::contextPasteCSV);
if (cpu().getCpuType() == BREAKPOINT_EE)
{
@ -87,14 +87,14 @@ void BreakpointWidget::openContextMenu(QPoint pos)
});
QAction* actionSave = menu->addAction(tr("Save to Settings"));
connect(actionSave, &QAction::triggered, this, &BreakpointWidget::saveBreakpointsToDebuggerSettings);
connect(actionSave, &QAction::triggered, this, &BreakpointView::saveBreakpointsToDebuggerSettings);
}
}
menu->popup(m_ui.breakpointList->viewport()->mapToGlobal(pos));
}
void BreakpointWidget::contextCopy()
void BreakpointView::contextCopy()
{
const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel();
@ -104,7 +104,7 @@ void BreakpointWidget::contextCopy()
QGuiApplication::clipboard()->setText(m_model->data(selModel->currentIndex()).toString());
}
void BreakpointWidget::contextDelete()
void BreakpointView::contextDelete()
{
const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel();
@ -121,14 +121,14 @@ void BreakpointWidget::contextDelete()
m_model->removeRows(*row, 1);
}
void BreakpointWidget::contextNew()
void BreakpointView::contextNew()
{
BreakpointDialog* bpDialog = new BreakpointDialog(this, &cpu(), *m_model);
bpDialog->setAttribute(Qt::WA_DeleteOnClose);
bpDialog->show();
}
void BreakpointWidget::contextEdit()
void BreakpointView::contextEdit()
{
const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel();
@ -144,7 +144,7 @@ void BreakpointWidget::contextEdit()
bpDialog->show();
}
void BreakpointWidget::contextPasteCSV()
void BreakpointView::contextPasteCSV()
{
QString csv = QGuiApplication::clipboard()->text();
// Skip header
@ -168,7 +168,7 @@ void BreakpointWidget::contextPasteCSV()
}
}
void BreakpointWidget::saveBreakpointsToDebuggerSettings()
void BreakpointView::saveBreakpointsToDebuggerSettings()
{
DebuggerSettingsManager::saveGameSettings(m_model);
}

8
pcsx2-qt/Debugger/Breakpoints/BreakpointWidget.h → pcsx2-qt/Debugger/Breakpoints/BreakpointView.h
View File

@ -3,7 +3,7 @@
#pragma once
#include "ui_BreakpointWidget.h"
#include "ui_BreakpointView.h"
#include "BreakpointModel.h"
@ -16,12 +16,12 @@
#include <QtWidgets/QTabBar>
#include <QtGui/QPainter>
class BreakpointWidget : public DebuggerView
class BreakpointView : public DebuggerView
{
Q_OBJECT
public:
BreakpointWidget(const DebuggerViewParameters& parameters);
BreakpointView(const DebuggerViewParameters& parameters);
void onDoubleClicked(const QModelIndex& index);
void openContextMenu(QPoint pos);
@ -35,7 +35,7 @@ public:
void saveBreakpointsToDebuggerSettings();
private:
Ui::BreakpointWidget m_ui;
Ui::BreakpointView m_ui;
BreakpointModel* m_model;
};

4
pcsx2-qt/Debugger/Breakpoints/BreakpointWidget.ui → pcsx2-qt/Debugger/Breakpoints/BreakpointView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BreakpointWidget</class>
<widget class="QWidget" name="BreakpointWidget">
<class>BreakpointView</class>
<widget class="QWidget" name="BreakpointView">
<property name="geometry">
<rect>
<x>0</x>

2
pcsx2-qt/Debugger/DebuggerWindow.cpp
View File

@ -346,7 +346,7 @@ void DebuggerWindow::onVMPaused()
});
}
// Stops us from telling the disassembly widget to jump somwhere because
// Stops us from telling the disassembly view to jump somwhere because
// breakpoint code paused the core.
if (!CBreakPoints::GetCorePaused())
emit onVMActuallyPaused();

134
pcsx2-qt/Debugger/DisassemblyWidget.cpp → pcsx2-qt/Debugger/DisassemblyView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "DisassemblyWidget.h"
#include "DisassemblyView.h"
#include "Debugger/DebuggerWindow.h"
#include "Debugger/JsonValueWrapper.h"
@ -24,7 +24,7 @@
using namespace QtUtils;
DisassemblyWidget::DisassemblyWidget(const DebuggerViewParameters& parameters)
DisassemblyView::DisassemblyView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, MONOSPACE_FONT)
{
m_ui.setupUi(this);
@ -34,10 +34,10 @@ DisassemblyWidget::DisassemblyWidget(const DebuggerViewParameters& parameters)
setFocusPolicy(Qt::FocusPolicy::ClickFocus);
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &DisassemblyWidget::customContextMenuRequested, this, &DisassemblyWidget::openContextMenu);
connect(this, &DisassemblyView::customContextMenuRequested, this, &DisassemblyView::openContextMenu);
connect(g_debugger_window, &DebuggerWindow::onVMActuallyPaused,
this, &DisassemblyWidget::gotoProgramCounterOnPause);
this, &DisassemblyView::gotoProgramCounterOnPause);
receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
update();
@ -58,9 +58,9 @@ DisassemblyWidget::DisassemblyWidget(const DebuggerViewParameters& parameters)
});
}
DisassemblyWidget::~DisassemblyWidget() = default;
DisassemblyView::~DisassemblyView() = default;
void DisassemblyWidget::toJson(JsonValueWrapper& json)
void DisassemblyView::toJson(JsonValueWrapper& json)
{
DebuggerView::toJson(json);
@ -69,7 +69,7 @@ void DisassemblyWidget::toJson(JsonValueWrapper& json)
json.value().AddMember("showInstructionBytes", m_showInstructionBytes, json.allocator());
}
bool DisassemblyWidget::fromJson(const JsonValueWrapper& json)
bool DisassemblyView::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerView::fromJson(json))
return false;
@ -91,22 +91,22 @@ bool DisassemblyWidget::fromJson(const JsonValueWrapper& json)
return true;
}
void DisassemblyWidget::contextCopyAddress()
void DisassemblyView::contextCopyAddress()
{
QGuiApplication::clipboard()->setText(FetchSelectionInfo(SelectionInfo::ADDRESS));
}
void DisassemblyWidget::contextCopyInstructionHex()
void DisassemblyView::contextCopyInstructionHex()
{
QGuiApplication::clipboard()->setText(FetchSelectionInfo(SelectionInfo::INSTRUCTIONHEX));
}
void DisassemblyWidget::contextCopyInstructionText()
void DisassemblyView::contextCopyInstructionText()
{
QGuiApplication::clipboard()->setText(FetchSelectionInfo(SelectionInfo::INSTRUCTIONTEXT));
}
void DisassemblyWidget::contextAssembleInstruction()
void DisassemblyView::contextAssembleInstruction()
{
if (!cpu().isCpuPaused())
{
@ -145,7 +145,7 @@ void DisassemblyWidget::contextAssembleInstruction()
}
}
void DisassemblyWidget::contextNoopInstruction()
void DisassemblyView::contextNoopInstruction()
{
Host::RunOnCPUThread([this, start = m_selectedAddressStart, end = m_selectedAddressEnd, cpu = &cpu()] {
for (u32 i = start; i <= end; i += 4)
@ -157,7 +157,7 @@ void DisassemblyWidget::contextNoopInstruction()
});
}
void DisassemblyWidget::contextRestoreInstruction()
void DisassemblyView::contextRestoreInstruction()
{
Host::RunOnCPUThread([this, start = m_selectedAddressStart, end = m_selectedAddressEnd, cpu = &cpu()] {
for (u32 i = start; i <= end; i += 4)
@ -172,7 +172,7 @@ void DisassemblyWidget::contextRestoreInstruction()
});
}
void DisassemblyWidget::contextRunToCursor()
void DisassemblyView::contextRunToCursor()
{
const u32 selectedAddressStart = m_selectedAddressStart;
Host::RunOnCPUThread([cpu = &cpu(), selectedAddressStart] {
@ -181,18 +181,18 @@ void DisassemblyWidget::contextRunToCursor()
});
}
void DisassemblyWidget::contextJumpToCursor()
void DisassemblyView::contextJumpToCursor()
{
cpu().setPc(m_selectedAddressStart);
this->repaint();
}
void DisassemblyWidget::contextToggleBreakpoint()
void DisassemblyView::contextToggleBreakpoint()
{
toggleBreakpoint(m_selectedAddressStart);
}
void DisassemblyWidget::contextFollowBranch()
void DisassemblyView::contextFollowBranch()
{
DisassemblyLineInfo line;
@ -207,7 +207,7 @@ void DisassemblyWidget::contextFollowBranch()
}
}
void DisassemblyWidget::contextGoToAddress()
void DisassemblyView::contextGoToAddress()
{
bool ok;
const QString targetString = QInputDialog::getText(this, tr("Go To In Disassembly"), "",
@ -227,7 +227,7 @@ void DisassemblyWidget::contextGoToAddress()
gotoAddressAndSetFocus(static_cast<u32>(address) & ~3);
}
void DisassemblyWidget::contextAddFunction()
void DisassemblyView::contextAddFunction()
{
NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
@ -239,13 +239,13 @@ void DisassemblyWidget::contextAddFunction()
update();
}
void DisassemblyWidget::contextCopyFunctionName()
void DisassemblyView::contextCopyFunctionName()
{
std::string name = cpu().GetSymbolGuardian().FunctionStartingAtAddress(m_selectedAddressStart).name;
QGuiApplication::clipboard()->setText(QString::fromStdString(name));
}
void DisassemblyWidget::contextRemoveFunction()
void DisassemblyView::contextRemoveFunction()
{
cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
ccc::Function* curFunc = database.functions.symbol_overlapping_address(m_selectedAddressStart);
@ -261,7 +261,7 @@ void DisassemblyWidget::contextRemoveFunction()
});
}
void DisassemblyWidget::contextRenameFunction()
void DisassemblyView::contextRenameFunction()
{
const FunctionInfo curFunc = cpu().GetSymbolGuardian().FunctionOverlappingAddress(m_selectedAddressStart);
@ -289,7 +289,7 @@ void DisassemblyWidget::contextRenameFunction()
});
}
void DisassemblyWidget::contextStubFunction()
void DisassemblyView::contextStubFunction()
{
FunctionInfo function = cpu().GetSymbolGuardian().FunctionOverlappingAddress(m_selectedAddressStart);
u32 address = function.address.valid() ? function.address.value : m_selectedAddressStart;
@ -302,7 +302,7 @@ void DisassemblyWidget::contextStubFunction()
});
}
void DisassemblyWidget::contextRestoreFunction()
void DisassemblyView::contextRestoreFunction()
{
u32 address = m_selectedAddressStart;
cpu().GetSymbolGuardian().Read([&](const ccc::SymbolDatabase& database) {
@ -328,13 +328,13 @@ void DisassemblyWidget::contextRestoreFunction()
}
}
void DisassemblyWidget::contextShowInstructionBytes()
void DisassemblyView::contextShowInstructionBytes()
{
m_showInstructionBytes = !m_showInstructionBytes;
this->repaint();
}
QString DisassemblyWidget::GetLineDisasm(u32 address)
QString DisassemblyView::GetLineDisasm(u32 address)
{
DisassemblyLineInfo lineInfo;
m_disassemblyManager.getLine(address, true, lineInfo);
@ -342,7 +342,7 @@ QString DisassemblyWidget::GetLineDisasm(u32 address)
};
// Here we go!
void DisassemblyWidget::paintEvent(QPaintEvent* event)
void DisassemblyView::paintEvent(QPaintEvent* event)
{
QPainter painter(this);
@ -526,7 +526,7 @@ void DisassemblyWidget::paintEvent(QPaintEvent* event)
painter.drawRect(0, 0, w, h);
}
void DisassemblyWidget::mousePressEvent(QMouseEvent* event)
void DisassemblyView::mousePressEvent(QMouseEvent* event)
{
// Calculate index of row that was clicked
const u32 selectedRowIndex = static_cast<int>(event->position().y()) / m_rowHeight;
@ -567,7 +567,7 @@ void DisassemblyWidget::mousePressEvent(QMouseEvent* event)
}
}
void DisassemblyWidget::mouseDoubleClickEvent(QMouseEvent* event)
void DisassemblyView::mouseDoubleClickEvent(QMouseEvent* event)
{
// Calculate index of row that was double clicked
const u32 selectedRowIndex = static_cast<int>(event->position().y()) / m_rowHeight;
@ -580,7 +580,7 @@ void DisassemblyWidget::mouseDoubleClickEvent(QMouseEvent* event)
}
}
void DisassemblyWidget::wheelEvent(QWheelEvent* event)
void DisassemblyView::wheelEvent(QWheelEvent* event)
{
if (event->angleDelta().y() < 0) // todo: max address bounds check?
{
@ -593,7 +593,7 @@ void DisassemblyWidget::wheelEvent(QWheelEvent* event)
this->repaint();
}
void DisassemblyWidget::keyPressEvent(QKeyEvent* event)
void DisassemblyView::keyPressEvent(QKeyEvent* event)
{
switch (event->key())
{
@ -665,7 +665,7 @@ void DisassemblyWidget::keyPressEvent(QKeyEvent* event)
this->repaint();
}
void DisassemblyWidget::openContextMenu(QPoint pos)
void DisassemblyView::openContextMenu(QPoint pos)
{
if (!cpu().isAlive())
return;
@ -678,19 +678,19 @@ void DisassemblyWidget::openContextMenu(QPoint pos)
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction* copy_address_action = menu->addAction(tr("Copy Address"));
connect(copy_address_action, &QAction::triggered, this, &DisassemblyWidget::contextCopyAddress);
connect(copy_address_action, &QAction::triggered, this, &DisassemblyView::contextCopyAddress);
QAction* copy_instruction_hex_action = menu->addAction(tr("Copy Instruction Hex"));
connect(copy_instruction_hex_action, &QAction::triggered, this, &DisassemblyWidget::contextCopyInstructionHex);
connect(copy_instruction_hex_action, &QAction::triggered, this, &DisassemblyView::contextCopyInstructionHex);
QAction* copy_instruction_text_action = menu->addAction(tr("&Copy Instruction Text"));
copy_instruction_text_action->setShortcut(QKeySequence(Qt::Key_C));
connect(copy_instruction_text_action, &QAction::triggered, this, &DisassemblyWidget::contextCopyInstructionText);
connect(copy_instruction_text_action, &QAction::triggered, this, &DisassemblyView::contextCopyInstructionText);
if (cpu().GetSymbolGuardian().FunctionExistsWithStartingAddress(m_selectedAddressStart))
{
QAction* copy_function_name_action = menu->addAction(tr("Copy Function Name"));
connect(copy_function_name_action, &QAction::triggered, this, &DisassemblyWidget::contextCopyFunctionName);
connect(copy_function_name_action, &QAction::triggered, this, &DisassemblyView::contextCopyFunctionName);
}
menu->addSeparator();
@ -698,37 +698,37 @@ void DisassemblyWidget::openContextMenu(QPoint pos)
if (AddressCanRestore(m_selectedAddressStart, m_selectedAddressEnd))
{
QAction* restore_instruction_action = menu->addAction(tr("Restore Instruction(s)"));
connect(restore_instruction_action, &QAction::triggered, this, &DisassemblyWidget::contextRestoreInstruction);
connect(restore_instruction_action, &QAction::triggered, this, &DisassemblyView::contextRestoreInstruction);
}
QAction* assemble_new_instruction = menu->addAction(tr("Asse&mble new Instruction(s)"));
assemble_new_instruction->setShortcut(QKeySequence(Qt::Key_M));
connect(assemble_new_instruction, &QAction::triggered, this, &DisassemblyWidget::contextAssembleInstruction);
connect(assemble_new_instruction, &QAction::triggered, this, &DisassemblyView::contextAssembleInstruction);
QAction* nop_instruction_action = menu->addAction(tr("NOP Instruction(s)"));
connect(nop_instruction_action, &QAction::triggered, this, &DisassemblyWidget::contextNoopInstruction);
connect(nop_instruction_action, &QAction::triggered, this, &DisassemblyView::contextNoopInstruction);
menu->addSeparator();
QAction* run_to_cursor_action = menu->addAction(tr("Run to Cursor"));
connect(run_to_cursor_action, &QAction::triggered, this, &DisassemblyWidget::contextRunToCursor);
connect(run_to_cursor_action, &QAction::triggered, this, &DisassemblyView::contextRunToCursor);
QAction* jump_to_cursor_action = menu->addAction(tr("&Jump to Cursor"));
jump_to_cursor_action->setShortcut(QKeySequence(Qt::Key_J));
connect(jump_to_cursor_action, &QAction::triggered, this, &DisassemblyWidget::contextJumpToCursor);
connect(jump_to_cursor_action, &QAction::triggered, this, &DisassemblyView::contextJumpToCursor);
QAction* toggle_breakpoint_action = menu->addAction(tr("Toggle &Breakpoint"));
toggle_breakpoint_action->setShortcut(QKeySequence(Qt::Key_B));
connect(toggle_breakpoint_action, &QAction::triggered, this, &DisassemblyWidget::contextToggleBreakpoint);
connect(toggle_breakpoint_action, &QAction::triggered, this, &DisassemblyView::contextToggleBreakpoint);
QAction* follow_branch_action = menu->addAction(tr("Follow Branch"));
connect(follow_branch_action, &QAction::triggered, this, &DisassemblyWidget::contextFollowBranch);
connect(follow_branch_action, &QAction::triggered, this, &DisassemblyView::contextFollowBranch);
menu->addSeparator();
QAction* go_to_address_action = menu->addAction(tr("&Go to Address"));
go_to_address_action->setShortcut(QKeySequence(Qt::Key_G));
connect(go_to_address_action, &QAction::triggered, this, &DisassemblyWidget::contextGoToAddress);
connect(go_to_address_action, &QAction::triggered, this, &DisassemblyView::contextGoToAddress);
createEventActions<DebuggerEvents::GoToAddress>(menu, [this]() {
DebuggerEvents::GoToAddress event;
@ -745,24 +745,24 @@ void DisassemblyWidget::openContextMenu(QPoint pos)
menu->addSeparator();
QAction* add_function_action = menu->addAction(tr("Add Function"));
connect(add_function_action, &QAction::triggered, this, &DisassemblyWidget::contextAddFunction);
connect(add_function_action, &QAction::triggered, this, &DisassemblyView::contextAddFunction);
QAction* rename_function_action = menu->addAction(tr("Rename Function"));
connect(rename_function_action, &QAction::triggered, this, &DisassemblyWidget::contextRenameFunction);
connect(rename_function_action, &QAction::triggered, this, &DisassemblyView::contextRenameFunction);
QAction* remove_function_action = menu->addAction(tr("Remove Function"));
menu->addAction(remove_function_action);
connect(remove_function_action, &QAction::triggered, this, &DisassemblyWidget::contextRemoveFunction);
connect(remove_function_action, &QAction::triggered, this, &DisassemblyView::contextRemoveFunction);
if (FunctionCanRestore(m_selectedAddressStart))
{
QAction* restore_action = menu->addAction(tr("Restore Function"));
connect(restore_action, &QAction::triggered, this, &DisassemblyWidget::contextRestoreFunction);
connect(restore_action, &QAction::triggered, this, &DisassemblyView::contextRestoreFunction);
}
else
{
QAction* stub_action = menu->addAction(tr("Stub (NOP) Function"));
connect(stub_action, &QAction::triggered, this, &DisassemblyWidget::contextStubFunction);
connect(stub_action, &QAction::triggered, this, &DisassemblyView::contextStubFunction);
}
menu->addSeparator();
@ -771,12 +771,12 @@ void DisassemblyWidget::openContextMenu(QPoint pos)
show_instruction_bytes_action->setShortcut(QKeySequence(Qt::Key_I));
show_instruction_bytes_action->setCheckable(true);
show_instruction_bytes_action->setChecked(m_showInstructionBytes);
connect(show_instruction_bytes_action, &QAction::triggered, this, &DisassemblyWidget::contextShowInstructionBytes);
connect(show_instruction_bytes_action, &QAction::triggered, this, &DisassemblyView::contextShowInstructionBytes);
menu->popup(this->mapToGlobal(pos));
}
QString DisassemblyWidget::GetDisassemblyTitleLine()
QString DisassemblyView::GetDisassemblyTitleLine()
{
// Disassembly column title line based on format created by DisassemblyStringFromAddress()
QString title_line_string;
@ -785,11 +785,11 @@ QString DisassemblyWidget::GetDisassemblyTitleLine()
const bool show_instruction_bytes = m_showInstructionBytes && cpu().isAlive();
if (show_instruction_bytes)
{
title_line_string = QCoreApplication::translate("DisassemblyWidgetColumnTitle", " %1 %2 %3 %4");
title_line_string = QCoreApplication::translate("DisassemblyViewColumnTitle", " %1 %2 %3 %4");
}
else
{
title_line_string = QCoreApplication::translate("DisassemblyWidgetColumnTitle", " %1 %2 %3");
title_line_string = QCoreApplication::translate("DisassemblyViewColumnTitle", " %1 %2 %3");
}
// First 2 chars in disassembly row is always for non-returning functions (NR)
@ -797,21 +797,21 @@ QString DisassemblyWidget::GetDisassemblyTitleLine()
title_line_string = title_line_string.arg(" ");
// Second column title is always address of instruction
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyWidgetColumnTitle", "Location"));
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyViewColumnTitle", "Location"));
// If user specified to "Show Instruction Bytes", third column is opcode + args
if (show_instruction_bytes)
{
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyWidgetColumnTitle", "Bytes "));
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyViewColumnTitle", "Bytes "));
}
// Last column title is always disassembled instruction
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyWidgetColumnTitle", "Instruction"));
title_line_string = title_line_string.arg(QCoreApplication::translate("DisassemblyViewColumnTitle", "Instruction"));
return title_line_string;
}
QColor DisassemblyWidget::GetDisassemblyTitleLineColor()
QColor DisassemblyView::GetDisassemblyTitleLineColor()
{
// Determine color of column title line. Based on QFusionStyle.
QColor title_line_color = this->palette().button().color();
@ -821,7 +821,7 @@ QColor DisassemblyWidget::GetDisassemblyTitleLineColor()
return title_line_color.lighter(104);
}
inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFont font, u32 pc, bool selected)
inline QString DisassemblyView::DisassemblyStringFromAddress(u32 address, QFont font, u32 pc, bool selected)
{
DisassemblyLineInfo line;
@ -882,7 +882,7 @@ inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFon
return lineString;
}
QColor DisassemblyWidget::GetAddressFunctionColor(u32 address)
QColor DisassemblyView::GetAddressFunctionColor(u32 address)
{
std::array<QColor, 6> colors;
if (QtUtils::IsLightTheme(palette()))
@ -920,7 +920,7 @@ QColor DisassemblyWidget::GetAddressFunctionColor(u32 address)
return colors[(function_address.value >> 4) % colors.size()];
}
QString DisassemblyWidget::FetchSelectionInfo(SelectionInfo selInfo)
QString DisassemblyView::FetchSelectionInfo(SelectionInfo selInfo)
{
QString infoBlock;
for (u32 i = m_selectedAddressStart; i <= m_selectedAddressEnd; i += 4)
@ -945,18 +945,18 @@ QString DisassemblyWidget::FetchSelectionInfo(SelectionInfo selInfo)
return infoBlock;
}
void DisassemblyWidget::gotoAddressAndSetFocus(u32 address)
void DisassemblyView::gotoAddressAndSetFocus(u32 address)
{
gotoAddress(address, true);
}
void DisassemblyWidget::gotoProgramCounterOnPause()
void DisassemblyView::gotoProgramCounterOnPause()
{
if (m_goToProgramCounterOnPause)
gotoAddress(cpu().getPC(), false);
}
void DisassemblyWidget::gotoAddress(u32 address, bool should_set_focus)
void DisassemblyView::gotoAddress(u32 address, bool should_set_focus)
{
const u32 destAddress = address & ~3;
// Center the address
@ -969,12 +969,12 @@ void DisassemblyWidget::gotoAddress(u32 address, bool should_set_focus)
this->setFocus();
}
void DisassemblyWidget::toggleBreakpoint(u32 address)
void DisassemblyView::toggleBreakpoint(u32 address)
{
if (!cpu().isAlive())
return;
QPointer<DisassemblyWidget> disassembly_widget(this);
QPointer<DisassemblyView> disassembly_widget(this);
Host::RunOnCPUThread([cpu = &cpu(), address, disassembly_widget] {
if (!CBreakPoints::IsAddressBreakPoint(cpu->getCpuType(), address))
@ -990,7 +990,7 @@ void DisassemblyWidget::toggleBreakpoint(u32 address)
});
}
bool DisassemblyWidget::AddressCanRestore(u32 start, u32 end)
bool DisassemblyView::AddressCanRestore(u32 start, u32 end)
{
for (u32 i = start; i <= end; i += 4)
{
@ -1002,7 +1002,7 @@ bool DisassemblyWidget::AddressCanRestore(u32 start, u32 end)
return false;
}
bool DisassemblyWidget::FunctionCanRestore(u32 address)
bool DisassemblyView::FunctionCanRestore(u32 address)
{
FunctionInfo function = cpu().GetSymbolGuardian().FunctionOverlappingAddress(address);
if (function.address.valid())

10
pcsx2-qt/Debugger/DisassemblyWidget.h → pcsx2-qt/Debugger/DisassemblyView.h
View File

@ -3,7 +3,7 @@
#pragma once
#include "ui_DisassemblyWidget.h"
#include "ui_DisassemblyView.h"
#include "DebuggerView.h"
@ -12,13 +12,13 @@
#include <QtWidgets/QMenu>
#include <QtGui/QPainter>
class DisassemblyWidget final : public DebuggerView
class DisassemblyView final : public DebuggerView
{
Q_OBJECT
public:
DisassemblyWidget(const DebuggerViewParameters& parameters);
~DisassemblyWidget();
DisassemblyView(const DebuggerViewParameters& parameters);
~DisassemblyView();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
@ -65,7 +65,7 @@ public slots:
void toggleBreakpoint(u32 address);
private:
Ui::DisassemblyWidget m_ui;
Ui::DisassemblyView m_ui;
u32 m_visibleStart = 0x100000; // The address of the first instruction shown.
u32 m_visibleRows;

4
pcsx2-qt/Debugger/DisassemblyWidget.ui → pcsx2-qt/Debugger/DisassemblyView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DisassemblyWidget</class>
<widget class="QWidget" name="DisassemblyWidget">
<class>DisassemblyView</class>
<widget class="QWidget" name="DisassemblyView">
<property name="geometry">
<rect>
<x>0</x>

90
pcsx2-qt/Debugger/Docking/DockTables.cpp
View File

@ -4,15 +4,15 @@
#include "DockTables.h"
#include "Debugger/DebuggerEvents.h"
#include "Debugger/DisassemblyWidget.h"
#include "Debugger/RegisterWidget.h"
#include "Debugger/StackWidget.h"
#include "Debugger/ThreadWidget.h"
#include "Debugger/Breakpoints/BreakpointWidget.h"
#include "Debugger/Memory/MemorySearchWidget.h"
#include "Debugger/Memory/MemoryViewWidget.h"
#include "Debugger/Memory/SavedAddressesWidget.h"
#include "Debugger/SymbolTree/SymbolTreeWidgets.h"
#include "Debugger/DisassemblyView.h"
#include "Debugger/RegisterView.h"
#include "Debugger/StackView.h"
#include "Debugger/ThreadView.h"
#include "Debugger/Breakpoints/BreakpointView.h"
#include "Debugger/Memory/MemorySearchView.h"
#include "Debugger/Memory/MemoryView.h"
#include "Debugger/Memory/SavedAddressesView.h"
#include "Debugger/SymbolTree/SymbolTreeViews.h"
using namespace DockUtils;
@ -37,18 +37,18 @@ static void hashString(const char* string, u32& hash);
}
const std::map<std::string, DockTables::DebuggerViewDescription> DockTables::DEBUGGER_VIEWS = {
DEBUGGER_VIEW(BreakpointWidget, QT_TRANSLATE_NOOP("DebuggerView", "Breakpoints"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(DisassemblyWidget, QT_TRANSLATE_NOOP("DebuggerView", "Disassembly"), TOP_RIGHT),
DEBUGGER_VIEW(FunctionTreeWidget, QT_TRANSLATE_NOOP("DebuggerView", "Functions"), TOP_LEFT),
DEBUGGER_VIEW(GlobalVariableTreeWidget, QT_TRANSLATE_NOOP("DebuggerView", "Globals"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(LocalVariableTreeWidget, QT_TRANSLATE_NOOP("DebuggerView", "Locals"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(MemorySearchWidget, QT_TRANSLATE_NOOP("DebuggerView", "Memory Search"), TOP_LEFT),
DEBUGGER_VIEW(MemoryViewWidget, QT_TRANSLATE_NOOP("DebuggerView", "Memory"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(ParameterVariableTreeWidget, QT_TRANSLATE_NOOP("DebuggerView", "Parameters"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(RegisterWidget, QT_TRANSLATE_NOOP("DebuggerView", "Registers"), TOP_LEFT),
DEBUGGER_VIEW(SavedAddressesWidget, QT_TRANSLATE_NOOP("DebuggerView", "Saved Addresses"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(StackWidget, QT_TRANSLATE_NOOP("DebuggerView", "Stack"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(ThreadWidget, QT_TRANSLATE_NOOP("DebuggerView", "Threads"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(BreakpointView, QT_TRANSLATE_NOOP("DebuggerView", "Breakpoints"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(DisassemblyView, QT_TRANSLATE_NOOP("DebuggerView", "Disassembly"), TOP_RIGHT),
DEBUGGER_VIEW(FunctionTreeView, QT_TRANSLATE_NOOP("DebuggerView", "Functions"), TOP_LEFT),
DEBUGGER_VIEW(GlobalVariableTreeView, QT_TRANSLATE_NOOP("DebuggerView", "Globals"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(LocalVariableTreeView, QT_TRANSLATE_NOOP("DebuggerView", "Locals"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(MemorySearchView, QT_TRANSLATE_NOOP("DebuggerView", "Memory Search"), TOP_LEFT),
DEBUGGER_VIEW(MemoryView, QT_TRANSLATE_NOOP("DebuggerView", "Memory"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(ParameterVariableTreeView, QT_TRANSLATE_NOOP("DebuggerView", "Parameters"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(RegisterView, QT_TRANSLATE_NOOP("DebuggerView", "Registers"), TOP_LEFT),
DEBUGGER_VIEW(SavedAddressesView, QT_TRANSLATE_NOOP("DebuggerView", "Saved Addresses"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(StackView, QT_TRANSLATE_NOOP("DebuggerView", "Stack"), BOTTOM_MIDDLE),
DEBUGGER_VIEW(ThreadView, QT_TRANSLATE_NOOP("DebuggerView", "Threads"), BOTTOM_MIDDLE),
};
#undef DEBUGGER_VIEW
@ -64,20 +64,20 @@ const std::vector<DockTables::DefaultDockLayout> DockTables::DEFAULT_DOCK_LAYOUT
},
.widgets = {
/* DefaultDockGroup::TOP_RIGHT */
{"DisassemblyWidget", DefaultDockGroup::TOP_RIGHT},
{"DisassemblyView", DefaultDockGroup::TOP_RIGHT},
/* DefaultDockGroup::BOTTOM */
{"MemoryViewWidget", DefaultDockGroup::BOTTOM},
{"BreakpointWidget", DefaultDockGroup::BOTTOM},
{"ThreadWidget", DefaultDockGroup::BOTTOM},
{"StackWidget", DefaultDockGroup::BOTTOM},
{"SavedAddressesWidget", DefaultDockGroup::BOTTOM},
{"GlobalVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"LocalVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"ParameterVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"MemoryView", DefaultDockGroup::BOTTOM},
{"BreakpointView", DefaultDockGroup::BOTTOM},
{"ThreadView", DefaultDockGroup::BOTTOM},
{"StackView", DefaultDockGroup::BOTTOM},
{"SavedAddressesView", DefaultDockGroup::BOTTOM},
{"GlobalVariableTreeView", DefaultDockGroup::BOTTOM},
{"LocalVariableTreeView", DefaultDockGroup::BOTTOM},
{"ParameterVariableTreeView", DefaultDockGroup::BOTTOM},
/* DefaultDockGroup::TOP_LEFT */
{"RegisterWidget", DefaultDockGroup::TOP_LEFT},
{"FunctionTreeWidget", DefaultDockGroup::TOP_LEFT},
{"MemorySearchWidget", DefaultDockGroup::TOP_LEFT},
{"RegisterView", DefaultDockGroup::TOP_LEFT},
{"FunctionTreeView", DefaultDockGroup::TOP_LEFT},
{"MemorySearchView", DefaultDockGroup::TOP_LEFT},
},
.toolbars = {
"toolBarDebug",
@ -94,20 +94,20 @@ const std::vector<DockTables::DefaultDockLayout> DockTables::DEFAULT_DOCK_LAYOUT
},
.widgets = {
/* DefaultDockGroup::TOP_RIGHT */
{"DisassemblyWidget", DefaultDockGroup::TOP_RIGHT},
{"DisassemblyView", DefaultDockGroup::TOP_RIGHT},
/* DefaultDockGroup::BOTTOM */
{"MemoryViewWidget", DefaultDockGroup::BOTTOM},
{"BreakpointWidget", DefaultDockGroup::BOTTOM},
{"ThreadWidget", DefaultDockGroup::BOTTOM},
{"StackWidget", DefaultDockGroup::BOTTOM},
{"SavedAddressesWidget", DefaultDockGroup::BOTTOM},
{"GlobalVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"LocalVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"ParameterVariableTreeWidget", DefaultDockGroup::BOTTOM},
{"MemoryView", DefaultDockGroup::BOTTOM},
{"BreakpointView", DefaultDockGroup::BOTTOM},
{"ThreadView", DefaultDockGroup::BOTTOM},
{"StackView", DefaultDockGroup::BOTTOM},
{"SavedAddressesView", DefaultDockGroup::BOTTOM},
{"GlobalVariableTreeView", DefaultDockGroup::BOTTOM},
{"LocalVariableTreeView", DefaultDockGroup::BOTTOM},
{"ParameterVariableTreeView", DefaultDockGroup::BOTTOM},
/* DefaultDockGroup::TOP_LEFT */
{"RegisterWidget", DefaultDockGroup::TOP_LEFT},
{"FunctionTreeWidget", DefaultDockGroup::TOP_LEFT},
{"MemorySearchWidget", DefaultDockGroup::TOP_LEFT},
{"RegisterView", DefaultDockGroup::TOP_LEFT},
{"FunctionTreeView", DefaultDockGroup::TOP_LEFT},
{"MemorySearchView", DefaultDockGroup::TOP_LEFT},
},
.toolbars = {
"toolBarDebug",

62
pcsx2-qt/Debugger/Memory/MemorySearchWidget.cpp → pcsx2-qt/Debugger/Memory/MemorySearchView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "MemorySearchWidget.h"
#include "MemorySearchView.h"
#include "DebugTools/DebugInterface.h"
@ -17,33 +17,33 @@
#include <QtCore/QFutureWatcher>
#include <QtGui/QPainter>
using SearchComparison = MemorySearchWidget::SearchComparison;
using SearchType = MemorySearchWidget::SearchType;
using SearchResult = MemorySearchWidget::SearchResult;
using SearchComparison = MemorySearchView::SearchComparison;
using SearchType = MemorySearchView::SearchType;
using SearchResult = MemorySearchView::SearchResult;
using namespace QtUtils;
MemorySearchWidget::MemorySearchWidget(const DebuggerViewParameters& parameters)
MemorySearchView::MemorySearchView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, MONOSPACE_FONT)
{
m_ui.setupUi(this);
this->repaint();
m_ui.listSearchResults->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.btnSearch, &QPushButton::clicked, this, &MemorySearchWidget::onSearchButtonClicked);
connect(m_ui.btnFilterSearch, &QPushButton::clicked, this, &MemorySearchWidget::onSearchButtonClicked);
connect(m_ui.btnSearch, &QPushButton::clicked, this, &MemorySearchView::onSearchButtonClicked);
connect(m_ui.btnFilterSearch, &QPushButton::clicked, this, &MemorySearchView::onSearchButtonClicked);
connect(m_ui.listSearchResults, &QListWidget::itemDoubleClicked, [](QListWidgetItem* item) {
goToInMemoryView(item->text().toUInt(nullptr, 16), true);
});
connect(m_ui.listSearchResults->verticalScrollBar(), &QScrollBar::valueChanged, this, &MemorySearchWidget::onSearchResultsListScroll);
connect(m_ui.listSearchResults, &QListView::customContextMenuRequested, this, &MemorySearchWidget::onListSearchResultsContextMenu);
connect(m_ui.cmbSearchType, &QComboBox::currentIndexChanged, this, &MemorySearchWidget::onSearchTypeChanged);
connect(m_ui.cmbSearchComparison, &QComboBox::currentIndexChanged, this, &MemorySearchWidget::onSearchComparisonChanged);
connect(m_ui.listSearchResults->verticalScrollBar(), &QScrollBar::valueChanged, this, &MemorySearchView::onSearchResultsListScroll);
connect(m_ui.listSearchResults, &QListView::customContextMenuRequested, this, &MemorySearchView::onListSearchResultsContextMenu);
connect(m_ui.cmbSearchType, &QComboBox::currentIndexChanged, this, &MemorySearchView::onSearchTypeChanged);
connect(m_ui.cmbSearchComparison, &QComboBox::currentIndexChanged, this, &MemorySearchView::onSearchComparisonChanged);
// Ensures we don't retrigger the load results function unintentionally
m_resultsLoadTimer.setInterval(100);
m_resultsLoadTimer.setSingleShot(true);
connect(&m_resultsLoadTimer, &QTimer::timeout, this, &MemorySearchWidget::loadSearchResults);
connect(&m_resultsLoadTimer, &QTimer::timeout, this, &MemorySearchView::loadSearchResults);
receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
update();
@ -51,7 +51,7 @@ MemorySearchWidget::MemorySearchWidget(const DebuggerViewParameters& parameters)
});
}
void MemorySearchWidget::contextRemoveSearchResult()
void MemorySearchView::contextRemoveSearchResult()
{
const QItemSelectionModel* selModel = m_ui.listSearchResults->selectionModel();
if (!selModel->hasSelection())
@ -67,7 +67,7 @@ void MemorySearchWidget::contextRemoveSearchResult()
delete rowToRemove;
}
void MemorySearchWidget::contextCopySearchResultAddress()
void MemorySearchView::contextCopySearchResultAddress()
{
if (!m_ui.listSearchResults->selectionModel()->hasSelection())
return;
@ -78,7 +78,7 @@ void MemorySearchWidget::contextCopySearchResultAddress()
QApplication::clipboard()->setText(addressString);
}
void MemorySearchWidget::onListSearchResultsContextMenu(QPoint pos)
void MemorySearchView::onListSearchResultsContextMenu(QPoint pos)
{
const QItemSelectionModel* selection_model = m_ui.listSearchResults->selectionModel();
const QListWidget* list_search_results = m_ui.listSearchResults;
@ -89,7 +89,7 @@ void MemorySearchWidget::onListSearchResultsContextMenu(QPoint pos)
if (selection_model->hasSelection())
{
connect(menu->addAction(tr("Copy Address")), &QAction::triggered,
this, &MemorySearchWidget::contextCopySearchResultAddress);
this, &MemorySearchView::contextCopySearchResultAddress);
createEventActions<DebuggerEvents::GoToAddress>(menu, [list_search_results]() {
u32 selected_address = list_search_results->selectedItems().first()->data(Qt::UserRole).toUInt();
@ -106,7 +106,7 @@ void MemorySearchWidget::onListSearchResultsContextMenu(QPoint pos)
});
connect(menu->addAction(tr("Remove Result")), &QAction::triggered,
this, &MemorySearchWidget::contextRemoveSearchResult);
this, &MemorySearchView::contextRemoveSearchResult);
}
menu->popup(m_ui.listSearchResults->viewport()->mapToGlobal(pos));
@ -297,7 +297,7 @@ void searchWorker(DebugInterface* cpu, std::vector<SearchResult>& searchResults,
T readValue = readValueAtAddress<T>(cpu, addr);
if (handleSearchComparison(searchComparison, addr, nullptr, searchValue, readValue))
{
searchResults.push_back(MemorySearchWidget::SearchResult(addr, QVariant::fromValue(readValue), searchType));
searchResults.push_back(MemorySearchView::SearchResult(addr, QVariant::fromValue(readValue), searchType));
}
}
}
@ -312,7 +312,7 @@ void searchWorker(DebugInterface* cpu, std::vector<SearchResult>& searchResults,
const bool doesMatch = handleSearchComparison(searchComparison, addr, &searchResult, searchValue, readValue);
if (!doesMatch)
searchResult = MemorySearchWidget::SearchResult(addr, QVariant::fromValue(readValue), searchType);
searchResult = MemorySearchView::SearchResult(addr, QVariant::fromValue(readValue), searchType);
return !doesMatch;
});
@ -399,7 +399,7 @@ static void searchWorkerByteArray(DebugInterface* cpu, SearchType searchType, Se
continue;
if (handleArraySearchComparison(cpu, searchComparison, addr, nullptr, searchValue))
{
searchResults.push_back(MemorySearchWidget::SearchResult(addr, searchValue, searchType));
searchResults.push_back(MemorySearchView::SearchResult(addr, searchValue, searchType));
addr += searchValue.length() - 1;
}
}
@ -421,7 +421,7 @@ static void searchWorkerByteArray(DebugInterface* cpu, SearchType searchType, Se
matchValue = searchResult.getArrayValue();
else
matchValue = readArrayAtAddress(cpu, addr, searchValue.length() - 1);
searchResult = MemorySearchWidget::SearchResult(addr, matchValue, searchType);
searchResult = MemorySearchView::SearchResult(addr, matchValue, searchType);
}
return !doesMatch;
});
@ -465,7 +465,7 @@ std::vector<SearchResult> startWorker(DebugInterface* cpu, const SearchType type
return searchResults;
}
void MemorySearchWidget::onSearchButtonClicked()
void MemorySearchView::onSearchButtonClicked()
{
if (!cpu().isAlive())
return;
@ -612,7 +612,7 @@ void MemorySearchWidget::onSearchButtonClicked()
m_ui.resultsCountLabel->setVisible(true);
}
void MemorySearchWidget::onSearchResultsListScroll(u32 value)
void MemorySearchView::onSearchResultsListScroll(u32 value)
{
const bool hasResultsToLoad = static_cast<size_t>(m_ui.listSearchResults->count()) < m_searchResults.size();
const bool scrolledSufficiently = value > (m_ui.listSearchResults->verticalScrollBar()->maximum() * 0.95);
@ -623,7 +623,7 @@ void MemorySearchWidget::onSearchResultsListScroll(u32 value)
}
}
void MemorySearchWidget::loadSearchResults()
void MemorySearchView::loadSearchResults()
{
const u32 numLoaded = m_ui.listSearchResults->count();
const u32 amountLeftToLoad = m_searchResults.size() - numLoaded;
@ -643,18 +643,18 @@ void MemorySearchWidget::loadSearchResults()
}
}
SearchType MemorySearchWidget::getCurrentSearchType()
SearchType MemorySearchView::getCurrentSearchType()
{
return static_cast<SearchType>(m_ui.cmbSearchType->currentIndex());
}
SearchComparison MemorySearchWidget::getCurrentSearchComparison()
SearchComparison MemorySearchView::getCurrentSearchComparison()
{
// Note: The index can't be converted directly to the enum value since we change what comparisons are shown.
return m_searchComparisonLabelMap.labelToEnum(m_ui.cmbSearchComparison->currentText());
}
bool MemorySearchWidget::doesSearchComparisonTakeInput(const SearchComparison comparison)
bool MemorySearchView::doesSearchComparisonTakeInput(const SearchComparison comparison)
{
switch (comparison)
{
@ -672,7 +672,7 @@ bool MemorySearchWidget::doesSearchComparisonTakeInput(const SearchComparison co
}
}
void MemorySearchWidget::onSearchTypeChanged(int newIndex)
void MemorySearchView::onSearchTypeChanged(int newIndex)
{
if (newIndex < 4)
m_ui.chkSearchHex->setEnabled(true);
@ -689,12 +689,12 @@ void MemorySearchWidget::onSearchTypeChanged(int newIndex)
updateSearchComparisonSelections();
}
void MemorySearchWidget::onSearchComparisonChanged(int newValue)
void MemorySearchView::onSearchComparisonChanged(int newValue)
{
m_ui.txtSearchValue->setEnabled(getCurrentSearchComparison() != SearchComparison::UnknownValue);
}
void MemorySearchWidget::updateSearchComparisonSelections()
void MemorySearchView::updateSearchComparisonSelections()
{
const QString selectedComparisonLabel = m_ui.cmbSearchComparison->currentText();
const SearchComparison selectedComparison = m_searchComparisonLabelMap.labelToEnum(selectedComparisonLabel);
@ -713,7 +713,7 @@ void MemorySearchWidget::updateSearchComparisonSelections()
m_ui.cmbSearchComparison->setCurrentText(selectedComparisonLabel);
}
std::vector<SearchComparison> MemorySearchWidget::getValidSearchComparisonsForState(SearchType type, std::vector<SearchResult>& existingResults)
std::vector<SearchComparison> MemorySearchView::getValidSearchComparisonsForState(SearchType type, std::vector<SearchResult>& existingResults)
{
const bool hasResults = existingResults.size() > 0;
std::vector<SearchComparison> comparisons = {SearchComparison::Equals};

10
pcsx2-qt/Debugger/Memory/MemorySearchWidget.h → pcsx2-qt/Debugger/Memory/MemorySearchView.h
View File

@ -3,7 +3,7 @@
#pragma once
#include "ui_MemorySearchWidget.h"
#include "ui_MemorySearchView.h"
#include "Debugger/DebuggerView.h"
@ -13,13 +13,13 @@
#include <QtCore/QTimer>
#include <QtCore/QMap>
class MemorySearchWidget final : public DebuggerView
class MemorySearchView final : public DebuggerView
{
Q_OBJECT
public:
MemorySearchWidget(const DebuggerViewParameters& parameters);
~MemorySearchWidget() = default;
MemorySearchView(const DebuggerViewParameters& parameters);
~MemorySearchView() = default;
enum class SearchType
{
@ -136,7 +136,7 @@ public slots:
private:
std::vector<SearchResult> m_searchResults;
SearchComparisonLabelMap m_searchComparisonLabelMap;
Ui::MemorySearchWidget m_ui;
Ui::MemorySearchView m_ui;
QTimer m_resultsLoadTimer;
u32 m_initialResultsLoadLimit = 20000;

4
pcsx2-qt/Debugger/Memory/MemorySearchWidget.ui → pcsx2-qt/Debugger/Memory/MemorySearchView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MemorySearchWidget</class>
<widget class="QWidget" name="MemorySearchWidget">
<class>MemorySearchView</class>
<widget class="QWidget" name="MemorySearchView">
<property name="geometry">
<rect>
<x>0</x>

46
pcsx2-qt/Debugger/Memory/MemoryViewWidget.cpp → pcsx2-qt/Debugger/Memory/MemoryView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "MemoryViewWidget.h"
#include "MemoryView.h"
#include "Debugger/JsonValueWrapper.h"
@ -451,9 +451,9 @@ bool MemoryViewTable::KeyPress(int key, QChar keychar, DebugInterface& cpu)
}
/*
MemoryViewWidget
MemoryView
*/
MemoryViewWidget::MemoryViewWidget(const DebuggerViewParameters& parameters)
MemoryView::MemoryView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, MONOSPACE_FONT)
, m_table(this)
{
@ -462,7 +462,7 @@ MemoryViewWidget::MemoryViewWidget(const DebuggerViewParameters& parameters)
setFocusPolicy(Qt::FocusPolicy::ClickFocus);
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &MemoryViewWidget::customContextMenuRequested, this, &MemoryViewWidget::openContextMenu);
connect(this, &MemoryView::customContextMenuRequested, this, &MemoryView::openContextMenu);
m_table.UpdateStartAddress(0x100000);
@ -485,9 +485,9 @@ MemoryViewWidget::MemoryViewWidget(const DebuggerViewParameters& parameters)
});
}
MemoryViewWidget::~MemoryViewWidget() = default;
MemoryView::~MemoryView() = default;
void MemoryViewWidget::toJson(JsonValueWrapper& json)
void MemoryView::toJson(JsonValueWrapper& json)
{
DebuggerView::toJson(json);
@ -496,7 +496,7 @@ void MemoryViewWidget::toJson(JsonValueWrapper& json)
json.value().AddMember("littleEndian", m_table.GetLittleEndian(), json.allocator());
}
bool MemoryViewWidget::fromJson(const JsonValueWrapper& json)
bool MemoryView::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerView::fromJson(json))
return false;
@ -525,7 +525,7 @@ bool MemoryViewWidget::fromJson(const JsonValueWrapper& json)
return true;
}
void MemoryViewWidget::paintEvent(QPaintEvent* event)
void MemoryView::paintEvent(QPaintEvent* event)
{
QPainter painter(this);
@ -537,7 +537,7 @@ void MemoryViewWidget::paintEvent(QPaintEvent* event)
m_table.DrawTable(painter, this->palette(), this->height(), cpu());
}
void MemoryViewWidget::mousePressEvent(QMouseEvent* event)
void MemoryView::mousePressEvent(QMouseEvent* event)
{
if (!cpu().isAlive())
return;
@ -546,7 +546,7 @@ void MemoryViewWidget::mousePressEvent(QMouseEvent* event)
repaint();
}
void MemoryViewWidget::openContextMenu(QPoint pos)
void MemoryView::openContextMenu(QPoint pos)
{
if (!cpu().isAlive())
return;
@ -615,10 +615,10 @@ void MemoryViewWidget::openContextMenu(QPoint pos)
return std::optional(event);
});
connect(menu->addAction(tr("Copy Byte")), &QAction::triggered, this, &MemoryViewWidget::contextCopyByte);
connect(menu->addAction(tr("Copy Segment")), &QAction::triggered, this, &MemoryViewWidget::contextCopySegment);
connect(menu->addAction(tr("Copy Character")), &QAction::triggered, this, &MemoryViewWidget::contextCopyCharacter);
connect(menu->addAction(tr("Paste")), &QAction::triggered, this, &MemoryViewWidget::contextPaste);
connect(menu->addAction(tr("Copy Byte")), &QAction::triggered, this, &MemoryView::contextCopyByte);
connect(menu->addAction(tr("Copy Segment")), &QAction::triggered, this, &MemoryView::contextCopySegment);
connect(menu->addAction(tr("Copy Character")), &QAction::triggered, this, &MemoryView::contextCopyCharacter);
connect(menu->addAction(tr("Paste")), &QAction::triggered, this, &MemoryView::contextPaste);
menu->popup(this->mapToGlobal(pos));
@ -626,27 +626,27 @@ void MemoryViewWidget::openContextMenu(QPoint pos)
return;
}
void MemoryViewWidget::contextCopyByte()
void MemoryView::contextCopyByte()
{
QApplication::clipboard()->setText(QString::number(cpu().read8(m_table.selectedAddress), 16).toUpper());
}
void MemoryViewWidget::contextCopySegment()
void MemoryView::contextCopySegment()
{
QApplication::clipboard()->setText(QString::number(m_table.GetSelectedSegment(cpu()).lo, 16).toUpper());
}
void MemoryViewWidget::contextCopyCharacter()
void MemoryView::contextCopyCharacter()
{
QApplication::clipboard()->setText(QChar::fromLatin1(cpu().read8(m_table.selectedAddress)).toUpper());
}
void MemoryViewWidget::contextPaste()
void MemoryView::contextPaste()
{
m_table.InsertAtCurrentSelection(QApplication::clipboard()->text(), cpu());
}
void MemoryViewWidget::contextGoToAddress()
void MemoryView::contextGoToAddress()
{
bool ok;
QString targetString = QInputDialog::getText(this, tr("Go To In Memory View"), "",
@ -666,11 +666,11 @@ void MemoryViewWidget::contextGoToAddress()
gotoAddress(static_cast<u32>(address));
}
void MemoryViewWidget::mouseDoubleClickEvent(QMouseEvent* event)
void MemoryView::mouseDoubleClickEvent(QMouseEvent* event)
{
}
void MemoryViewWidget::wheelEvent(QWheelEvent* event)
void MemoryView::wheelEvent(QWheelEvent* event)
{
if (event->angleDelta().y() < 0)
{
@ -683,7 +683,7 @@ void MemoryViewWidget::wheelEvent(QWheelEvent* event)
this->repaint();
}
void MemoryViewWidget::keyPressEvent(QKeyEvent* event)
void MemoryView::keyPressEvent(QKeyEvent* event)
{
if (!m_table.KeyPress(event->key(), event->text().size() ? event->text()[0] : '\0', cpu()))
{
@ -704,7 +704,7 @@ void MemoryViewWidget::keyPressEvent(QKeyEvent* event)
DebuggerView::broadcastEvent(DebuggerEvents::VMUpdate());
}
void MemoryViewWidget::gotoAddress(u32 address)
void MemoryView::gotoAddress(u32 address)
{
m_table.UpdateStartAddress(address & ~0xF);
m_table.selectedAddress = address;

10
pcsx2-qt/Debugger/Memory/MemoryViewWidget.h → pcsx2-qt/Debugger/Memory/MemoryView.h
View File

@ -3,7 +3,7 @@
#pragma once
#include "ui_MemoryViewWidget.h"
#include "ui_MemoryView.h"
#include "Debugger/DebuggerView.h"
@ -104,13 +104,13 @@ public:
}
};
class MemoryViewWidget final : public DebuggerView
class MemoryView final : public DebuggerView
{
Q_OBJECT
public:
MemoryViewWidget(const DebuggerViewParameters& parameters);
~MemoryViewWidget();
MemoryView(const DebuggerViewParameters& parameters);
~MemoryView();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
@ -133,7 +133,7 @@ public slots:
void gotoAddress(u32 address);
private:
Ui::MemoryViewWidget ui;
Ui::MemoryView ui;
MemoryViewTable m_table;
};

4
pcsx2-qt/Debugger/Memory/MemoryViewWidget.ui → pcsx2-qt/Debugger/Memory/MemoryView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MemoryViewWidget</class>
<widget class="QWidget" name="MemoryViewWidget">
<class>MemoryView</class>
<widget class="QWidget" name="MemoryView">
<property name="geometry">
<rect>
<x>0</x>

22
pcsx2-qt/Debugger/Memory/SavedAddressesWidget.cpp → pcsx2-qt/Debugger/Memory/SavedAddressesView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "SavedAddressesWidget.h"
#include "SavedAddressesView.h"
#include "QtUtils.h"
#include "Debugger/DebuggerSettingsManager.h"
@ -9,7 +9,7 @@
#include <QtGui/QClipboard>
#include <QtWidgets/QMenu>
SavedAddressesWidget::SavedAddressesWidget(const DebuggerViewParameters& parameters)
SavedAddressesView::SavedAddressesView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, DISALLOW_MULTIPLE_INSTANCES)
, m_model(SavedAddressesModel::getInstance(cpu()))
{
@ -19,7 +19,7 @@ SavedAddressesWidget::SavedAddressesWidget(const DebuggerViewParameters& paramet
m_ui.savedAddressesList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.savedAddressesList, &QTableView::customContextMenuRequested,
this, &SavedAddressesWidget::openContextMenu);
this, &SavedAddressesView::openContextMenu);
connect(g_emu_thread, &EmuThread::onGameChanged, this, [this](const QString& title) {
if (title.isEmpty())
@ -51,13 +51,13 @@ SavedAddressesWidget::SavedAddressesWidget(const DebuggerViewParameters& paramet
});
}
void SavedAddressesWidget::openContextMenu(QPoint pos)
void SavedAddressesView::openContextMenu(QPoint pos)
{
QMenu* menu = new QMenu(this);
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction* new_action = menu->addAction(tr("New"));
connect(new_action, &QAction::triggered, this, &SavedAddressesWidget::contextNew);
connect(new_action, &QAction::triggered, this, &SavedAddressesView::contextNew);
const QModelIndex index_at_pos = m_ui.savedAddressesList->indexAt(pos);
const bool is_index_valid = index_at_pos.isValid();
@ -92,7 +92,7 @@ void SavedAddressesWidget::openContextMenu(QPoint pos)
}
QAction* paste_from_csv_action = menu->addAction(tr("Paste from CSV"));
connect(paste_from_csv_action, &QAction::triggered, this, &SavedAddressesWidget::contextPasteCSV);
connect(paste_from_csv_action, &QAction::triggered, this, &SavedAddressesView::contextPasteCSV);
QAction* load_action = menu->addAction(tr("Load from Settings"));
load_action->setEnabled(is_cpu_alive);
@ -103,7 +103,7 @@ void SavedAddressesWidget::openContextMenu(QPoint pos)
QAction* save_action = menu->addAction(tr("Save to Settings"));
save_action->setEnabled(is_cpu_alive);
connect(save_action, &QAction::triggered, this, &SavedAddressesWidget::saveToDebuggerSettings);
connect(save_action, &QAction::triggered, this, &SavedAddressesView::saveToDebuggerSettings);
QAction* delete_action = menu->addAction(tr("Delete"));
connect(delete_action, &QAction::triggered, this, [this, index_at_pos]() {
@ -114,7 +114,7 @@ void SavedAddressesWidget::openContextMenu(QPoint pos)
menu->popup(m_ui.savedAddressesList->viewport()->mapToGlobal(pos));
}
void SavedAddressesWidget::contextPasteCSV()
void SavedAddressesView::contextPasteCSV()
{
QString csv = QGuiApplication::clipboard()->text();
// Skip header
@ -139,14 +139,14 @@ void SavedAddressesWidget::contextPasteCSV()
}
}
void SavedAddressesWidget::contextNew()
void SavedAddressesView::contextNew()
{
m_model->addRow();
const u32 row_count = m_model->rowCount();
m_ui.savedAddressesList->edit(m_model->index(row_count - 1, 0));
}
void SavedAddressesWidget::addAddress(u32 address)
void SavedAddressesView::addAddress(u32 address)
{
m_model->addRow();
@ -160,7 +160,7 @@ void SavedAddressesWidget::addAddress(u32 address)
m_ui.savedAddressesList->edit(label_index);
}
void SavedAddressesWidget::saveToDebuggerSettings()
void SavedAddressesView::saveToDebuggerSettings()
{
DebuggerSettingsManager::saveGameSettings(m_model);
}

8
pcsx2-qt/Debugger/Memory/SavedAddressesWidget.h → pcsx2-qt/Debugger/Memory/SavedAddressesView.h
View File

@ -3,18 +3,18 @@
#pragma once
#include "ui_SavedAddressesWidget.h"
#include "ui_SavedAddressesView.h"
#include "SavedAddressesModel.h"
#include "Debugger/DebuggerView.h"
class SavedAddressesWidget : public DebuggerView
class SavedAddressesView : public DebuggerView
{
Q_OBJECT
public:
SavedAddressesWidget(const DebuggerViewParameters& parameters);
SavedAddressesView(const DebuggerViewParameters& parameters);
void openContextMenu(QPoint pos);
void contextPasteCSV();
@ -23,7 +23,7 @@ public:
void saveToDebuggerSettings();
private:
Ui::SavedAddressesWidget m_ui;
Ui::SavedAddressesView m_ui;
SavedAddressesModel* m_model;
};

4
pcsx2-qt/Debugger/Memory/SavedAddressesWidget.ui → pcsx2-qt/Debugger/Memory/SavedAddressesView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SavedAddressesWidget</class>
<widget class="QWidget" name="SavedAddressesWidget">
<class>SavedAddressesView</class>
<widget class="QWidget" name="SavedAddressesView">
<property name="geometry">
<rect>
<x>0</x>

62
pcsx2-qt/Debugger/RegisterWidget.cpp → pcsx2-qt/Debugger/RegisterView.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "RegisterWidget.h"
#include "RegisterView.h"
#include "Debugger/JsonValueWrapper.h"
@ -21,7 +21,7 @@
using namespace QtUtils;
RegisterWidget::RegisterWidget(const DebuggerViewParameters& parameters)
RegisterView::RegisterView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, MONOSPACE_FONT)
{
this->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
@ -29,8 +29,8 @@ RegisterWidget::RegisterWidget(const DebuggerViewParameters& parameters)
ui.setupUi(this);
ui.registerTabs->setDrawBase(false);
connect(this, &RegisterWidget::customContextMenuRequested, this, &RegisterWidget::customMenuRequested);
connect(ui.registerTabs, &QTabBar::currentChanged, this, &RegisterWidget::tabCurrentChanged);
connect(this, &RegisterView::customContextMenuRequested, this, &RegisterView::customMenuRequested);
connect(ui.registerTabs, &QTabBar::currentChanged, this, &RegisterView::tabCurrentChanged);
for (int i = 0; i < cpu().getRegisterCategoryCount(); i++)
{
@ -45,11 +45,11 @@ RegisterWidget::RegisterWidget(const DebuggerViewParameters& parameters)
});
}
RegisterWidget::~RegisterWidget()
RegisterView::~RegisterView()
{
}
void RegisterWidget::toJson(JsonValueWrapper& json)
void RegisterView::toJson(JsonValueWrapper& json)
{
DebuggerView::toJson(json);
@ -57,7 +57,7 @@ void RegisterWidget::toJson(JsonValueWrapper& json)
json.value().AddMember("showFPRFloat", m_showFPRFloat, json.allocator());
}
bool RegisterWidget::fromJson(const JsonValueWrapper& json)
bool RegisterView::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerView::fromJson(json))
return false;
@ -75,12 +75,12 @@ bool RegisterWidget::fromJson(const JsonValueWrapper& json)
return true;
}
void RegisterWidget::tabCurrentChanged(int cur)
void RegisterView::tabCurrentChanged(int cur)
{
m_rowStart = 0;
}
void RegisterWidget::paintEvent(QPaintEvent* event)
void RegisterView::paintEvent(QPaintEvent* event)
{
QPainter painter(this);
painter.setPen(this->palette().text().color());
@ -190,7 +190,7 @@ void RegisterWidget::paintEvent(QPaintEvent* event)
painter.end();
}
void RegisterWidget::mousePressEvent(QMouseEvent* event)
void RegisterView::mousePressEvent(QMouseEvent* event)
{
const int categoryIndex = ui.registerTabs->currentIndex();
m_selectedRow = static_cast<int>(((event->position().y() - m_renderStart.y()) / m_rowHeight)) + m_rowStart;
@ -213,7 +213,7 @@ void RegisterWidget::mousePressEvent(QMouseEvent* event)
this->repaint();
}
void RegisterWidget::wheelEvent(QWheelEvent* event)
void RegisterView::wheelEvent(QWheelEvent* event)
{
if (event->angleDelta().y() < 0 && m_rowEnd < cpu().getRegisterCount(ui.registerTabs->currentIndex()))
{
@ -227,7 +227,7 @@ void RegisterWidget::wheelEvent(QWheelEvent* event)
this->repaint();
}
void RegisterWidget::mouseDoubleClickEvent(QMouseEvent* event)
void RegisterView::mouseDoubleClickEvent(QMouseEvent* event)
{
if (!cpu().isAlive())
return;
@ -240,7 +240,7 @@ void RegisterWidget::mouseDoubleClickEvent(QMouseEvent* event)
contextChangeValue();
}
void RegisterWidget::customMenuRequested(QPoint pos)
void RegisterView::customMenuRequested(QPoint pos)
{
if (!cpu().isAlive())
return;
@ -281,13 +281,13 @@ void RegisterWidget::customMenuRequested(QPoint pos)
if (cpu().getRegisterSize(categoryIndex) == 128)
{
connect(menu->addAction(tr("Copy Top Half")), &QAction::triggered, this, &RegisterWidget::contextCopyTop);
connect(menu->addAction(tr("Copy Bottom Half")), &QAction::triggered, this, &RegisterWidget::contextCopyBottom);
connect(menu->addAction(tr("Copy Segment")), &QAction::triggered, this, &RegisterWidget::contextCopySegment);
connect(menu->addAction(tr("Copy Top Half")), &QAction::triggered, this, &RegisterView::contextCopyTop);
connect(menu->addAction(tr("Copy Bottom Half")), &QAction::triggered, this, &RegisterView::contextCopyBottom);
connect(menu->addAction(tr("Copy Segment")), &QAction::triggered, this, &RegisterView::contextCopySegment);
}
else
{
connect(menu->addAction(tr("Copy Value")), &QAction::triggered, this, &RegisterWidget::contextCopyValue);
connect(menu->addAction(tr("Copy Value")), &QAction::triggered, this, &RegisterView::contextCopyValue);
}
menu->addSeparator();
@ -295,16 +295,16 @@ void RegisterWidget::customMenuRequested(QPoint pos)
if (cpu().getRegisterSize(categoryIndex) == 128)
{
connect(menu->addAction(tr("Change Top Half")), &QAction::triggered,
this, &RegisterWidget::contextChangeTop);
this, &RegisterView::contextChangeTop);
connect(menu->addAction(tr("Change Bottom Half")), &QAction::triggered,
this, &RegisterWidget::contextChangeBottom);
this, &RegisterView::contextChangeBottom);
connect(menu->addAction(tr("Change Segment")), &QAction::triggered,
this, &RegisterWidget::contextChangeSegment);
this, &RegisterView::contextChangeSegment);
}
else
{
connect(menu->addAction(tr("Change Value")), &QAction::triggered,
this, &RegisterWidget::contextChangeValue);
this, &RegisterView::contextChangeValue);
}
menu->addSeparator();
@ -317,7 +317,7 @@ void RegisterWidget::customMenuRequested(QPoint pos)
}
void RegisterWidget::contextCopyValue()
void RegisterView::contextCopyValue()
{
const int categoryIndex = ui.registerTabs->currentIndex();
const u128 val = cpu().getRegister(categoryIndex, m_selectedRow);
@ -327,21 +327,21 @@ void RegisterWidget::contextCopyValue()
QApplication::clipboard()->setText(QString("%1").arg(QString::number(val._u64[0], 16).toUpper(), 16));
}
void RegisterWidget::contextCopyTop()
void RegisterView::contextCopyTop()
{
const int categoryIndex = ui.registerTabs->currentIndex();
const u128 val = cpu().getRegister(categoryIndex, m_selectedRow);
QApplication::clipboard()->setText(FilledQStringFromValue(val.hi, 16));
}
void RegisterWidget::contextCopyBottom()
void RegisterView::contextCopyBottom()
{
const int categoryIndex = ui.registerTabs->currentIndex();
const u128 val = cpu().getRegister(categoryIndex, m_selectedRow);
QApplication::clipboard()->setText(FilledQStringFromValue(val.lo, 16));
}
void RegisterWidget::contextCopySegment()
void RegisterView::contextCopySegment()
{
const int categoryIndex = ui.registerTabs->currentIndex();
const u128 val = cpu().getRegister(categoryIndex, m_selectedRow);
@ -351,7 +351,7 @@ void RegisterWidget::contextCopySegment()
QApplication::clipboard()->setText(FilledQStringFromValue(val._u32[3 - m_selected128Field], 16));
}
bool RegisterWidget::contextFetchNewValue(u64& out, u64 currentValue, bool segment)
bool RegisterView::contextFetchNewValue(u64& out, u64 currentValue, bool segment)
{
const int categoryIndex = ui.registerTabs->currentIndex();
const bool floatingPoint = CAT_SHOW_FLOAT && segment;
@ -394,7 +394,7 @@ bool RegisterWidget::contextFetchNewValue(u64& out, u64 currentValue, bool segme
return true;
}
void RegisterWidget::contextChangeValue()
void RegisterView::contextChangeValue()
{
const int categoryIndex = ui.registerTabs->currentIndex();
u64 newVal;
@ -405,7 +405,7 @@ void RegisterWidget::contextChangeValue()
}
}
void RegisterWidget::contextChangeTop()
void RegisterView::contextChangeTop()
{
u64 newVal;
u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
@ -417,7 +417,7 @@ void RegisterWidget::contextChangeTop()
}
}
void RegisterWidget::contextChangeBottom()
void RegisterView::contextChangeBottom()
{
u64 newVal;
u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
@ -429,7 +429,7 @@ void RegisterWidget::contextChangeBottom()
}
}
void RegisterWidget::contextChangeSegment()
void RegisterView::contextChangeSegment()
{
u64 newVal;
u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
@ -441,7 +441,7 @@ void RegisterWidget::contextChangeSegment()
}
}
std::optional<DebuggerEvents::GoToAddress> RegisterWidget::contextCreateGotoEvent()
std::optional<DebuggerEvents::GoToAddress> RegisterView::contextCreateGotoEvent()
{
const int categoryIndex = ui.registerTabs->currentIndex();
u128 regVal = cpu().getRegister(categoryIndex, m_selectedRow);

10
pcsx2-qt/Debugger/RegisterWidget.h → pcsx2-qt/Debugger/RegisterView.h
View File

@ -3,7 +3,7 @@
#pragma once
#include "ui_RegisterWidget.h"
#include "ui_RegisterView.h"
#include "DebuggerView.h"
@ -14,13 +14,13 @@
#include <QtWidgets/QTabBar>
#include <QtGui/QPainter>
class RegisterWidget final : public DebuggerView
class RegisterView final : public DebuggerView
{
Q_OBJECT
public:
RegisterWidget(const DebuggerViewParameters& parameters);
~RegisterWidget();
RegisterView(const DebuggerViewParameters& parameters);
~RegisterView();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
@ -47,7 +47,7 @@ public slots:
void tabCurrentChanged(int cur);
private:
Ui::RegisterWidget ui;
Ui::RegisterView ui;
// Returns true on success
bool contextFetchNewValue(u64& out, u64 currentValue, bool segment = false);

4
pcsx2-qt/Debugger/RegisterWidget.ui → pcsx2-qt/Debugger/RegisterView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>RegisterWidget</class>
<widget class="QWidget" name="RegisterWidget">
<class>RegisterView</class>
<widget class="QWidget" name="RegisterView">
<property name="geometry">
<rect>
<x>0</x>

12
pcsx2-qt/Debugger/StackWidget.cpp → pcsx2-qt/Debugger/StackView.cpp
View File

@ -1,22 +1,22 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "StackWidget.h"
#include "StackView.h"
#include "QtUtils.h"
#include <QtGui/QClipboard>
#include <QtWidgets/QMenu>
StackWidget::StackWidget(const DebuggerViewParameters& parameters)
StackView::StackView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, NO_DEBUGGER_FLAGS)
, m_model(new StackModel(cpu()))
{
m_ui.setupUi(this);
m_ui.stackList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.stackList, &QTableView::customContextMenuRequested, this, &StackWidget::openContextMenu);
connect(m_ui.stackList, &QTableView::doubleClicked, this, &StackWidget::onDoubleClick);
connect(m_ui.stackList, &QTableView::customContextMenuRequested, this, &StackView::openContextMenu);
connect(m_ui.stackList, &QTableView::doubleClicked, this, &StackView::onDoubleClick);
m_ui.stackList->setModel(m_model);
for (std::size_t i = 0; auto mode : StackModel::HeaderResizeModes)
@ -31,7 +31,7 @@ StackWidget::StackWidget(const DebuggerViewParameters& parameters)
});
}
void StackWidget::openContextMenu(QPoint pos)
void StackView::openContextMenu(QPoint pos)
{
if (!m_ui.stackList->selectionModel()->hasSelection())
return;
@ -58,7 +58,7 @@ void StackWidget::openContextMenu(QPoint pos)
menu->popup(m_ui.stackList->viewport()->mapToGlobal(pos));
}
void StackWidget::onDoubleClick(const QModelIndex& index)
void StackView::onDoubleClick(const QModelIndex& index)
{
switch (index.column())
{

8
pcsx2-qt/Debugger/StackWidget.h → pcsx2-qt/Debugger/StackView.h
View File

@ -3,24 +3,24 @@
#pragma once
#include "ui_StackWidget.h"
#include "ui_StackView.h"
#include "StackModel.h"
#include "DebuggerView.h"
class StackWidget final : public DebuggerView
class StackView final : public DebuggerView
{
Q_OBJECT
public:
StackWidget(const DebuggerViewParameters& parameters);
StackView(const DebuggerViewParameters& parameters);
void openContextMenu(QPoint pos);
void onDoubleClick(const QModelIndex& index);
private:
Ui::StackWidget m_ui;
Ui::StackView m_ui;
StackModel* m_model;
};

4
pcsx2-qt/Debugger/StackWidget.ui → pcsx2-qt/Debugger/StackView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>StackWidget</class>
<widget class="QWidget" name="StackWidget">
<class>StackView</class>
<widget class="QWidget" name="StackView">
<property name="geometry">
<rect>
<x>0</x>

4
pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidget.ui → pcsx2-qt/Debugger/SymbolTree/SymbolTreeView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SymbolTreeWidget</class>
<widget class="QWidget" name="SymbolTreeWidget">
<class>SymbolTreeView</class>
<widget class="QWidget" name="SymbolTreeView">
<property name="geometry">
<rect>
<x>0</x>

146
pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.cpp → pcsx2-qt/Debugger/SymbolTree/SymbolTreeViews.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "SymbolTreeWidgets.h"
#include "SymbolTreeViews.h"
#include "Debugger/JsonValueWrapper.h"
#include "Debugger/SymbolTree/NewSymbolDialogs.h"
@ -15,7 +15,7 @@
static bool testName(const QString& name, const QString& filter);
SymbolTreeWidget::SymbolTreeWidget(
SymbolTreeView::SymbolTreeView(
u32 flags,
s32 symbol_address_alignment,
const DebuggerViewParameters& parameters)
@ -34,17 +34,17 @@ SymbolTreeWidget::SymbolTreeWidget(
reset();
});
connect(m_ui.filterBox, &QLineEdit::textEdited, this, &SymbolTreeWidget::reset);
connect(m_ui.filterBox, &QLineEdit::textEdited, this, &SymbolTreeView::reset);
connect(m_ui.newButton, &QPushButton::clicked, this, &SymbolTreeWidget::onNewButtonPressed);
connect(m_ui.deleteButton, &QPushButton::clicked, this, &SymbolTreeWidget::onDeleteButtonPressed);
connect(m_ui.newButton, &QPushButton::clicked, this, &SymbolTreeView::onNewButtonPressed);
connect(m_ui.deleteButton, &QPushButton::clicked, this, &SymbolTreeView::onDeleteButtonPressed);
connect(m_ui.treeView->verticalScrollBar(), &QScrollBar::valueChanged, this, [&]() {
updateVisibleNodes(false);
});
m_ui.treeView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.treeView, &QTreeView::customContextMenuRequested, this, &SymbolTreeWidget::openContextMenu);
connect(m_ui.treeView, &QTreeView::customContextMenuRequested, this, &SymbolTreeView::openContextMenu);
connect(m_ui.treeView, &QTreeView::expanded, this, [&]() {
updateVisibleNodes(true);
@ -56,16 +56,16 @@ SymbolTreeWidget::SymbolTreeWidget(
});
}
SymbolTreeWidget::~SymbolTreeWidget() = default;
SymbolTreeView::~SymbolTreeView() = default;
void SymbolTreeWidget::resizeEvent(QResizeEvent* event)
void SymbolTreeView::resizeEvent(QResizeEvent* event)
{
QWidget::resizeEvent(event);
updateVisibleNodes(false);
}
void SymbolTreeWidget::toJson(JsonValueWrapper& json)
void SymbolTreeView::toJson(JsonValueWrapper& json)
{
DebuggerView::toJson(json);
@ -83,7 +83,7 @@ void SymbolTreeWidget::toJson(JsonValueWrapper& json)
}
}
bool SymbolTreeWidget::fromJson(const JsonValueWrapper& json)
bool SymbolTreeView::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerView::fromJson(json))
return false;
@ -137,7 +137,7 @@ bool SymbolTreeWidget::fromJson(const JsonValueWrapper& json)
return true;
}
void SymbolTreeWidget::updateModel()
void SymbolTreeView::updateModel()
{
if (needsReset())
reset();
@ -145,7 +145,7 @@ void SymbolTreeWidget::updateModel()
updateVisibleNodes(true);
}
void SymbolTreeWidget::reset()
void SymbolTreeView::reset()
{
if (!m_model)
setupTree();
@ -170,7 +170,7 @@ void SymbolTreeWidget::reset()
}
}
void SymbolTreeWidget::updateVisibleNodes(bool update_hashes)
void SymbolTreeView::updateVisibleNodes(bool update_hashes)
{
if (!m_model)
return;
@ -199,7 +199,7 @@ void SymbolTreeWidget::updateVisibleNodes(bool update_hashes)
m_ui.treeView->update();
}
void SymbolTreeWidget::expandGroups(QModelIndex index)
void SymbolTreeView::expandGroups(QModelIndex index)
{
if (!m_model)
return;
@ -218,7 +218,7 @@ void SymbolTreeWidget::expandGroups(QModelIndex index)
}
}
void SymbolTreeWidget::setupTree()
void SymbolTreeView::setupTree()
{
m_model = new SymbolTreeModel(cpu(), this);
m_ui.treeView->setModel(m_model);
@ -237,10 +237,10 @@ void SymbolTreeWidget::setupTree()
configureColumns();
connect(m_ui.treeView, &QTreeView::pressed, this, &SymbolTreeWidget::onTreeViewClicked);
connect(m_ui.treeView, &QTreeView::pressed, this, &SymbolTreeView::onTreeViewClicked);
}
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const ccc::SymbolDatabase& database)
std::unique_ptr<SymbolTreeNode> SymbolTreeView::buildTree(const ccc::SymbolDatabase& database)
{
std::vector<SymbolWork> symbols = getSymbols(m_ui.filterBox->text(), database);
@ -321,7 +321,7 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const ccc::SymbolDat
return root;
}
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySourceFile(
std::unique_ptr<SymbolTreeNode> SymbolTreeView::groupBySourceFile(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
@ -364,7 +364,7 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySourceFile(
return child;
}
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySection(
std::unique_ptr<SymbolTreeNode> SymbolTreeView::groupBySection(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
@ -403,7 +403,7 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySection(
return child;
}
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupByModule(
std::unique_ptr<SymbolTreeNode> SymbolTreeView::groupByModule(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
@ -448,7 +448,7 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupByModule(
return child;
}
void SymbolTreeWidget::openContextMenu(QPoint pos)
void SymbolTreeView::openContextMenu(QPoint pos)
{
SymbolTreeNode* node = currentNode();
if (!node)
@ -462,22 +462,22 @@ void SymbolTreeWidget::openContextMenu(QPoint pos)
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction* copy_name = menu->addAction(tr("Copy Name"));
connect(copy_name, &QAction::triggered, this, &SymbolTreeWidget::onCopyName);
connect(copy_name, &QAction::triggered, this, &SymbolTreeView::onCopyName);
if (m_flags & ALLOW_MANGLED_NAME_ACTIONS)
{
QAction* copy_mangled_name = menu->addAction(tr("Copy Mangled Name"));
connect(copy_mangled_name, &QAction::triggered, this, &SymbolTreeWidget::onCopyMangledName);
connect(copy_mangled_name, &QAction::triggered, this, &SymbolTreeView::onCopyMangledName);
}
QAction* copy_location = menu->addAction(tr("Copy Location"));
connect(copy_location, &QAction::triggered, this, &SymbolTreeWidget::onCopyLocation);
connect(copy_location, &QAction::triggered, this, &SymbolTreeView::onCopyLocation);
menu->addSeparator();
QAction* rename_symbol = menu->addAction(tr("Rename Symbol"));
rename_symbol->setEnabled(node_is_symbol);
connect(rename_symbol, &QAction::triggered, this, &SymbolTreeWidget::onRenameSymbol);
connect(rename_symbol, &QAction::triggered, this, &SymbolTreeView::onRenameSymbol);
menu->addSeparator();
@ -551,22 +551,22 @@ void SymbolTreeWidget::openContextMenu(QPoint pos)
QAction* reset_children = menu->addAction(tr("Reset Children"));
reset_children->setEnabled(node_is_object);
connect(reset_children, &QAction::triggered, this, &SymbolTreeWidget::onResetChildren);
connect(reset_children, &QAction::triggered, this, &SymbolTreeView::onResetChildren);
QAction* change_type_temporarily = menu->addAction(tr("Change Type Temporarily"));
change_type_temporarily->setEnabled(node_is_object);
connect(change_type_temporarily, &QAction::triggered, this, &SymbolTreeWidget::onChangeTypeTemporarily);
connect(change_type_temporarily, &QAction::triggered, this, &SymbolTreeView::onChangeTypeTemporarily);
}
menu->popup(m_ui.treeView->viewport()->mapToGlobal(pos));
}
bool SymbolTreeWidget::needsReset() const
bool SymbolTreeView::needsReset() const
{
return !m_model || m_model->needsReset();
}
void SymbolTreeWidget::onDeleteButtonPressed()
void SymbolTreeView::onDeleteButtonPressed()
{
SymbolTreeNode* node = currentNode();
if (!node)
@ -585,7 +585,7 @@ void SymbolTreeWidget::onDeleteButtonPressed()
reset();
}
void SymbolTreeWidget::onCopyName()
void SymbolTreeView::onCopyName()
{
SymbolTreeNode* node = currentNode();
if (!node)
@ -594,7 +594,7 @@ void SymbolTreeWidget::onCopyName()
QApplication::clipboard()->setText(node->name);
}
void SymbolTreeWidget::onCopyMangledName()
void SymbolTreeView::onCopyMangledName()
{
SymbolTreeNode* node = currentNode();
if (!node)
@ -606,7 +606,7 @@ void SymbolTreeWidget::onCopyMangledName()
QApplication::clipboard()->setText(node->name);
}
void SymbolTreeWidget::onCopyLocation()
void SymbolTreeView::onCopyLocation()
{
SymbolTreeNode* node = currentNode();
if (!node)
@ -615,7 +615,7 @@ void SymbolTreeWidget::onCopyLocation()
QApplication::clipboard()->setText(node->location.toString(cpu()));
}
void SymbolTreeWidget::onRenameSymbol()
void SymbolTreeView::onRenameSymbol()
{
SymbolTreeNode* node = currentNode();
if (!node || !node->symbol.valid())
@ -643,7 +643,7 @@ void SymbolTreeWidget::onRenameSymbol()
});
}
void SymbolTreeWidget::onResetChildren()
void SymbolTreeView::onResetChildren()
{
if (!m_model)
return;
@ -655,7 +655,7 @@ void SymbolTreeWidget::onResetChildren()
m_model->resetChildren(index);
}
void SymbolTreeWidget::onChangeTypeTemporarily()
void SymbolTreeView::onChangeTypeTemporarily()
{
if (!m_model)
return;
@ -683,7 +683,7 @@ void SymbolTreeWidget::onChangeTypeTemporarily()
QMessageBox::warning(this, tr("Cannot Change Type"), *error_message);
}
void SymbolTreeWidget::onTreeViewClicked(const QModelIndex& index)
void SymbolTreeView::onTreeViewClicked(const QModelIndex& index)
{
if (!index.isValid())
return;
@ -701,7 +701,7 @@ void SymbolTreeWidget::onTreeViewClicked(const QModelIndex& index)
goToInDisassembler(node->location.address, false);
}
SymbolTreeNode* SymbolTreeWidget::currentNode()
SymbolTreeNode* SymbolTreeView::currentNode()
{
if (!m_model)
return nullptr;
@ -712,20 +712,20 @@ SymbolTreeNode* SymbolTreeWidget::currentNode()
// *****************************************************************************
FunctionTreeWidget::FunctionTreeWidget(const DebuggerViewParameters& parameters)
: SymbolTreeWidget(
FunctionTreeView::FunctionTreeView(const DebuggerViewParameters& parameters)
: SymbolTreeView(
ALLOW_GROUPING | ALLOW_MANGLED_NAME_ACTIONS | CLICK_TO_GO_TO_IN_DISASSEMBLER,
4,
parameters)
{
}
FunctionTreeWidget::~FunctionTreeWidget() = default;
FunctionTreeView::~FunctionTreeView() = default;
std::vector<SymbolTreeWidget::SymbolWork> FunctionTreeWidget::getSymbols(
std::vector<SymbolTreeView::SymbolWork> FunctionTreeView::getSymbols(
const QString& filter, const ccc::SymbolDatabase& database)
{
std::vector<SymbolTreeWidget::SymbolWork> symbols;
std::vector<SymbolTreeView::SymbolWork> symbols;
for (const ccc::Function& function : database.functions)
{
@ -750,7 +750,7 @@ std::vector<SymbolTreeWidget::SymbolWork> FunctionTreeWidget::getSymbols(
return symbols;
}
std::unique_ptr<SymbolTreeNode> FunctionTreeWidget::buildNode(
std::unique_ptr<SymbolTreeNode> FunctionTreeView::buildNode(
SymbolWork& work, const ccc::SymbolDatabase& database) const
{
const ccc::Function& function = static_cast<const ccc::Function&>(*work.symbol);
@ -777,7 +777,7 @@ std::unique_ptr<SymbolTreeNode> FunctionTreeWidget::buildNode(
return node;
}
void FunctionTreeWidget::configureColumns()
void FunctionTreeView::configureColumns()
{
m_ui.treeView->setColumnHidden(SymbolTreeModel::NAME, false);
m_ui.treeView->setColumnHidden(SymbolTreeModel::LOCATION, false);
@ -790,7 +790,7 @@ void FunctionTreeWidget::configureColumns()
m_ui.treeView->header()->setStretchLastSection(false);
}
void FunctionTreeWidget::onNewButtonPressed()
void FunctionTreeView::onNewButtonPressed()
{
NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
@ -800,20 +800,20 @@ void FunctionTreeWidget::onNewButtonPressed()
// *****************************************************************************
GlobalVariableTreeWidget::GlobalVariableTreeWidget(const DebuggerViewParameters& parameters)
: SymbolTreeWidget(
GlobalVariableTreeView::GlobalVariableTreeView(const DebuggerViewParameters& parameters)
: SymbolTreeView(
ALLOW_GROUPING | ALLOW_SORTING_BY_IF_TYPE_IS_KNOWN | ALLOW_TYPE_ACTIONS | ALLOW_MANGLED_NAME_ACTIONS,
1,
parameters)
{
}
GlobalVariableTreeWidget::~GlobalVariableTreeWidget() = default;
GlobalVariableTreeView::~GlobalVariableTreeView() = default;
std::vector<SymbolTreeWidget::SymbolWork> GlobalVariableTreeWidget::getSymbols(
std::vector<SymbolTreeView::SymbolWork> GlobalVariableTreeView::getSymbols(
const QString& filter, const ccc::SymbolDatabase& database)
{
std::vector<SymbolTreeWidget::SymbolWork> symbols;
std::vector<SymbolTreeView::SymbolWork> symbols;
for (const ccc::GlobalVariable& global_variable : database.global_variables)
{
@ -875,7 +875,7 @@ std::vector<SymbolTreeWidget::SymbolWork> GlobalVariableTreeWidget::getSymbols(
return symbols;
}
std::unique_ptr<SymbolTreeNode> GlobalVariableTreeWidget::buildNode(
std::unique_ptr<SymbolTreeNode> GlobalVariableTreeView::buildNode(
SymbolWork& work, const ccc::SymbolDatabase& database) const
{
std::unique_ptr<SymbolTreeNode> node = std::make_unique<SymbolTreeNode>();
@ -918,7 +918,7 @@ std::unique_ptr<SymbolTreeNode> GlobalVariableTreeWidget::buildNode(
return node;
}
void GlobalVariableTreeWidget::configureColumns()
void GlobalVariableTreeView::configureColumns()
{
m_ui.treeView->setColumnHidden(SymbolTreeModel::NAME, false);
m_ui.treeView->setColumnHidden(SymbolTreeModel::LOCATION, false);
@ -933,7 +933,7 @@ void GlobalVariableTreeWidget::configureColumns()
m_ui.treeView->header()->setStretchLastSection(false);
}
void GlobalVariableTreeWidget::onNewButtonPressed()
void GlobalVariableTreeView::onNewButtonPressed()
{
NewGlobalVariableDialog* dialog = new NewGlobalVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
@ -943,17 +943,17 @@ void GlobalVariableTreeWidget::onNewButtonPressed()
// *****************************************************************************
LocalVariableTreeWidget::LocalVariableTreeWidget(const DebuggerViewParameters& parameters)
: SymbolTreeWidget(
LocalVariableTreeView::LocalVariableTreeView(const DebuggerViewParameters& parameters)
: SymbolTreeView(
ALLOW_TYPE_ACTIONS,
1,
parameters)
{
}
LocalVariableTreeWidget::~LocalVariableTreeWidget() = default;
LocalVariableTreeView::~LocalVariableTreeView() = default;
bool LocalVariableTreeWidget::needsReset() const
bool LocalVariableTreeView::needsReset() const
{
if (!m_function.valid())
return true;
@ -975,10 +975,10 @@ bool LocalVariableTreeWidget::needsReset() const
if (left_function)
return true;
return SymbolTreeWidget::needsReset();
return SymbolTreeView::needsReset();
}
std::vector<SymbolTreeWidget::SymbolWork> LocalVariableTreeWidget::getSymbols(
std::vector<SymbolTreeView::SymbolWork> LocalVariableTreeView::getSymbols(
const QString& filter, const ccc::SymbolDatabase& database)
{
u32 program_counter = cpu().getPC();
@ -992,7 +992,7 @@ std::vector<SymbolTreeWidget::SymbolWork> LocalVariableTreeWidget::getSymbols(
m_function = function->handle();
m_caller_stack_pointer = cpu().getCallerStackPointer(*function);
std::vector<SymbolTreeWidget::SymbolWork> symbols;
std::vector<SymbolTreeView::SymbolWork> symbols;
for (const ccc::LocalVariableHandle local_variable_handle : *function->local_variables())
{
@ -1024,7 +1024,7 @@ std::vector<SymbolTreeWidget::SymbolWork> LocalVariableTreeWidget::getSymbols(
return symbols;
}
std::unique_ptr<SymbolTreeNode> LocalVariableTreeWidget::buildNode(
std::unique_ptr<SymbolTreeNode> LocalVariableTreeView::buildNode(
SymbolWork& work, const ccc::SymbolDatabase& database) const
{
const ccc::LocalVariable& local_variable = static_cast<const ccc::LocalVariable&>(*work.symbol);
@ -1047,7 +1047,7 @@ std::unique_ptr<SymbolTreeNode> LocalVariableTreeWidget::buildNode(
return node;
}
void LocalVariableTreeWidget::configureColumns()
void LocalVariableTreeView::configureColumns()
{
m_ui.treeView->setColumnHidden(SymbolTreeModel::NAME, false);
m_ui.treeView->setColumnHidden(SymbolTreeModel::LOCATION, false);
@ -1062,7 +1062,7 @@ void LocalVariableTreeWidget::configureColumns()
m_ui.treeView->header()->setStretchLastSection(false);
}
void LocalVariableTreeWidget::onNewButtonPressed()
void LocalVariableTreeView::onNewButtonPressed()
{
NewLocalVariableDialog* dialog = new NewLocalVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
@ -1072,17 +1072,17 @@ void LocalVariableTreeWidget::onNewButtonPressed()
// *****************************************************************************
ParameterVariableTreeWidget::ParameterVariableTreeWidget(const DebuggerViewParameters& parameters)
: SymbolTreeWidget(
ParameterVariableTreeView::ParameterVariableTreeView(const DebuggerViewParameters& parameters)
: SymbolTreeView(
ALLOW_TYPE_ACTIONS,
1,
parameters)
{
}
ParameterVariableTreeWidget::~ParameterVariableTreeWidget() = default;
ParameterVariableTreeView::~ParameterVariableTreeView() = default;
bool ParameterVariableTreeWidget::needsReset() const
bool ParameterVariableTreeView::needsReset() const
{
if (!m_function.valid())
return true;
@ -1104,13 +1104,13 @@ bool ParameterVariableTreeWidget::needsReset() const
if (left_function)
return true;
return SymbolTreeWidget::needsReset();
return SymbolTreeView::needsReset();
}
std::vector<SymbolTreeWidget::SymbolWork> ParameterVariableTreeWidget::getSymbols(
std::vector<SymbolTreeView::SymbolWork> ParameterVariableTreeView::getSymbols(
const QString& filter, const ccc::SymbolDatabase& database)
{
std::vector<SymbolTreeWidget::SymbolWork> symbols;
std::vector<SymbolTreeView::SymbolWork> symbols;
u32 program_counter = cpu().getPC();
const ccc::Function* function = database.functions.symbol_overlapping_address(program_counter);
@ -1154,7 +1154,7 @@ std::vector<SymbolTreeWidget::SymbolWork> ParameterVariableTreeWidget::getSymbol
return symbols;
}
std::unique_ptr<SymbolTreeNode> ParameterVariableTreeWidget::buildNode(
std::unique_ptr<SymbolTreeNode> ParameterVariableTreeView::buildNode(
SymbolWork& work, const ccc::SymbolDatabase& database) const
{
const ccc::ParameterVariable& parameter_variable = static_cast<const ccc::ParameterVariable&>(*work.symbol);
@ -1174,7 +1174,7 @@ std::unique_ptr<SymbolTreeNode> ParameterVariableTreeWidget::buildNode(
return node;
}
void ParameterVariableTreeWidget::configureColumns()
void ParameterVariableTreeView::configureColumns()
{
m_ui.treeView->setColumnHidden(SymbolTreeModel::NAME, false);
m_ui.treeView->setColumnHidden(SymbolTreeModel::LOCATION, false);
@ -1189,7 +1189,7 @@ void ParameterVariableTreeWidget::configureColumns()
m_ui.treeView->header()->setStretchLastSection(false);
}
void ParameterVariableTreeWidget::onNewButtonPressed()
void ParameterVariableTreeView::onNewButtonPressed()
{
NewParameterVariableDialog* dialog = new NewParameterVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);

36
pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.h → pcsx2-qt/Debugger/SymbolTree/SymbolTreeViews.h
View File

@ -3,19 +3,19 @@
#pragma once
#include "ui_SymbolTreeWidget.h"
#include "ui_SymbolTreeView.h"
#include "Debugger/DebuggerView.h"
#include "Debugger/SymbolTree/SymbolTreeModel.h"
// A symbol tree widget with its associated refresh button, filter box and
// A symbol tree view with its associated refresh button, filter box and
// right-click menu. Supports grouping, sorting and various other settings.
class SymbolTreeWidget : public DebuggerView
class SymbolTreeView : public DebuggerView
{
Q_OBJECT
public:
virtual ~SymbolTreeWidget();
virtual ~SymbolTreeView();
void updateModel();
void reset();
@ -33,7 +33,7 @@ protected:
const ccc::SourceFile* source_file = nullptr;
};
SymbolTreeWidget(
SymbolTreeView(
u32 flags,
s32 symbol_address_alignment,
const DebuggerViewParameters& parameters);
@ -90,7 +90,7 @@ protected:
SymbolTreeNode* currentNode();
Ui::SymbolTreeWidget m_ui;
Ui::SymbolTreeView m_ui;
SymbolTreeModel* m_model = nullptr;
@ -114,12 +114,12 @@ protected:
bool m_sort_by_if_type_is_known = false;
};
class FunctionTreeWidget : public SymbolTreeWidget
class FunctionTreeView : public SymbolTreeView
{
Q_OBJECT
public:
explicit FunctionTreeWidget(const DebuggerViewParameters& parameters);
virtual ~FunctionTreeWidget();
explicit FunctionTreeView(const DebuggerViewParameters& parameters);
virtual ~FunctionTreeView();
protected:
std::vector<SymbolWork> getSymbols(
@ -133,12 +133,12 @@ protected:
void onNewButtonPressed() override;
};
class GlobalVariableTreeWidget : public SymbolTreeWidget
class GlobalVariableTreeView : public SymbolTreeView
{
Q_OBJECT
public:
explicit GlobalVariableTreeWidget(const DebuggerViewParameters& parameters);
virtual ~GlobalVariableTreeWidget();
explicit GlobalVariableTreeView(const DebuggerViewParameters& parameters);
virtual ~GlobalVariableTreeView();
protected:
std::vector<SymbolWork> getSymbols(
@ -152,12 +152,12 @@ protected:
void onNewButtonPressed() override;
};
class LocalVariableTreeWidget : public SymbolTreeWidget
class LocalVariableTreeView : public SymbolTreeView
{
Q_OBJECT
public:
explicit LocalVariableTreeWidget(const DebuggerViewParameters& parameters);
virtual ~LocalVariableTreeWidget();
explicit LocalVariableTreeView(const DebuggerViewParameters& parameters);
virtual ~LocalVariableTreeView();
protected:
bool needsReset() const override;
@ -176,12 +176,12 @@ protected:
std::optional<u32> m_caller_stack_pointer;
};
class ParameterVariableTreeWidget : public SymbolTreeWidget
class ParameterVariableTreeView : public SymbolTreeView
{
Q_OBJECT
public:
explicit ParameterVariableTreeWidget(const DebuggerViewParameters& parameters);
virtual ~ParameterVariableTreeWidget();
explicit ParameterVariableTreeView(const DebuggerViewParameters& parameters);
virtual ~ParameterVariableTreeView();
protected:
bool needsReset() const override;

12
pcsx2-qt/Debugger/ThreadWidget.cpp → pcsx2-qt/Debugger/ThreadView.cpp
View File

@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+
#include "ThreadWidget.h"
#include "ThreadView.h"
#include "QtUtils.h"
#include <QtGui/QClipboard>
#include <QtWidgets/QMenu>
ThreadWidget::ThreadWidget(const DebuggerViewParameters& parameters)
ThreadView::ThreadView(const DebuggerViewParameters& parameters)
: DebuggerView(parameters, NO_DEBUGGER_FLAGS)
, m_model(new ThreadModel(cpu()))
, m_proxy_model(new QSortFilterProxyModel())
@ -16,8 +16,8 @@ ThreadWidget::ThreadWidget(const DebuggerViewParameters& parameters)
m_ui.setupUi(this);
m_ui.threadList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui.threadList, &QTableView::customContextMenuRequested, this, &ThreadWidget::openContextMenu);
connect(m_ui.threadList, &QTableView::doubleClicked, this, &ThreadWidget::onDoubleClick);
connect(m_ui.threadList, &QTableView::customContextMenuRequested, this, &ThreadView::openContextMenu);
connect(m_ui.threadList, &QTableView::doubleClicked, this, &ThreadView::onDoubleClick);
m_proxy_model->setSourceModel(m_model);
m_proxy_model->setSortRole(Qt::UserRole);
@ -36,7 +36,7 @@ ThreadWidget::ThreadWidget(const DebuggerViewParameters& parameters)
});
}
void ThreadWidget::openContextMenu(QPoint pos)
void ThreadView::openContextMenu(QPoint pos)
{
if (!m_ui.threadList->selectionModel()->hasSelection())
return;
@ -63,7 +63,7 @@ void ThreadWidget::openContextMenu(QPoint pos)
menu->popup(m_ui.threadList->viewport()->mapToGlobal(pos));
}
void ThreadWidget::onDoubleClick(const QModelIndex& index)
void ThreadView::onDoubleClick(const QModelIndex& index)
{
switch (index.column())
{

8
pcsx2-qt/Debugger/ThreadWidget.h → pcsx2-qt/Debugger/ThreadView.h
View File

@ -3,25 +3,25 @@
#pragma once
#include "ui_ThreadWidget.h"
#include "ui_ThreadView.h"
#include "DebuggerView.h"
#include "ThreadModel.h"
#include <QtCore/QSortFilterProxyModel>
class ThreadWidget final : public DebuggerView
class ThreadView final : public DebuggerView
{
Q_OBJECT
public:
ThreadWidget(const DebuggerViewParameters& parameters);
ThreadView(const DebuggerViewParameters& parameters);
void openContextMenu(QPoint pos);
void onDoubleClick(const QModelIndex& index);
private:
Ui::ThreadWidget m_ui;
Ui::ThreadView m_ui;
ThreadModel* m_model;
QSortFilterProxyModel* m_proxy_model;

4
pcsx2-qt/Debugger/ThreadWidget.ui → pcsx2-qt/Debugger/ThreadView.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ThreadWidget</class>
<widget class="QWidget" name="ThreadWidget">
<class>ThreadView</class>
<widget class="QWidget" name="ThreadView">
<property name="geometry">
<rect>
<x>0</x>

72
pcsx2-qt/pcsx2-qt.vcxproj
View File

@ -95,7 +95,7 @@
<ClCompile Include="Debugger\SymbolTree\SymbolTreeLocation.cpp" />
<ClCompile Include="Debugger\SymbolTree\SymbolTreeModel.cpp" />
<ClCompile Include="Debugger\SymbolTree\SymbolTreeNode.cpp" />
<ClCompile Include="Debugger\SymbolTree\SymbolTreeWidgets.cpp" />
<ClCompile Include="Debugger\SymbolTree\SymbolTreeViews.cpp" />
<ClCompile Include="Debugger\SymbolTree\TypeString.cpp" />
<ClCompile Include="EarlyHardwareCheck.cpp" />
<ClCompile Include="LogWindow.cpp" />
@ -114,16 +114,16 @@
<ClCompile Include="Debugger\AnalysisOptionsDialog.cpp" />
<ClCompile Include="Debugger\DebuggerView.cpp" />
<ClCompile Include="Debugger\DebuggerWindow.cpp" />
<ClCompile Include="Debugger\DisassemblyWidget.cpp" />
<ClCompile Include="Debugger\RegisterWidget.cpp" />
<ClCompile Include="Debugger\DisassemblyView.cpp" />
<ClCompile Include="Debugger\RegisterView.cpp" />
<ClCompile Include="Debugger\DebuggerSettingsManager.cpp" />
<ClCompile Include="Debugger\StackModel.cpp" />
<ClCompile Include="Debugger\StackWidget.cpp" />
<ClCompile Include="Debugger\StackView.cpp" />
<ClCompile Include="Debugger\ThreadModel.cpp" />
<ClCompile Include="Debugger\ThreadWidget.cpp" />
<ClCompile Include="Debugger\ThreadView.cpp" />
<ClCompile Include="Debugger\Breakpoints\BreakpointDialog.cpp" />
<ClCompile Include="Debugger\Breakpoints\BreakpointModel.cpp" />
<ClCompile Include="Debugger\Breakpoints\BreakpointWidget.cpp" />
<ClCompile Include="Debugger\Breakpoints\BreakpointView.cpp" />
<ClCompile Include="Debugger\Docking\DockLayout.cpp" />
<ClCompile Include="Debugger\Docking\DockManager.cpp" />
<ClCompile Include="Debugger\Docking\DockMenuBar.cpp" />
@ -133,10 +133,10 @@
<ClCompile Include="Debugger\Docking\DropIndicators.cpp" />
<ClCompile Include="Debugger\Docking\LayoutEditorDialog.cpp" />
<ClCompile Include="Debugger\Docking\NoLayoutsWidget.cpp" />
<ClCompile Include="Debugger\Memory\MemorySearchWidget.cpp" />
<ClCompile Include="Debugger\Memory\MemoryViewWidget.cpp" />
<ClCompile Include="Debugger\Memory\MemorySearchView.cpp" />
<ClCompile Include="Debugger\Memory\MemoryView.cpp" />
<ClCompile Include="Debugger\Memory\SavedAddressesModel.cpp" />
<ClCompile Include="Debugger\Memory\SavedAddressesWidget.cpp" />
<ClCompile Include="Debugger\Memory\SavedAddressesView.cpp" />
<ClCompile Include="Settings\BIOSSettingsWidget.cpp" />
<ClCompile Include="Settings\ControllerBindingWidget.cpp" />
<ClCompile Include="Settings\ControllerGlobalSettingsWidget.cpp" />
@ -207,7 +207,7 @@
<QtMoc Include="Debugger\SymbolTree\SymbolTreeLocation.h" />
<QtMoc Include="Debugger\SymbolTree\SymbolTreeModel.h" />
<QtMoc Include="Debugger\SymbolTree\SymbolTreeNode.h" />
<QtMoc Include="Debugger\SymbolTree\SymbolTreeWidgets.h" />
<QtMoc Include="Debugger\SymbolTree\SymbolTreeViews.h" />
<QtMoc Include="Debugger\SymbolTree\TypeString.h" />
<ClInclude Include="Settings\ControllerSettingWidgetBinder.h" />
<QtMoc Include="Settings\FolderSettingsWidget.h" />
@ -231,16 +231,16 @@
<QtMoc Include="Debugger\DebuggerEvents.h" />
<QtMoc Include="Debugger\DebuggerView.h" />
<QtMoc Include="Debugger\DebuggerWindow.h" />
<QtMoc Include="Debugger\DisassemblyWidget.h" />
<QtMoc Include="Debugger\RegisterWidget.h" />
<QtMoc Include="Debugger\DisassemblyView.h" />
<QtMoc Include="Debugger\RegisterView.h" />
<QtMoc Include="Debugger\StackModel.h" />
<QtMoc Include="Debugger\StackWidget.h" />
<QtMoc Include="Debugger\StackView.h" />
<QtMoc Include="Debugger\ThreadModel.h" />
<QtMoc Include="Debugger\ThreadWidget.h" />
<QtMoc Include="Debugger\ThreadView.h" />
<ClInclude Include="Debugger\DebuggerSettingsManager.h" />
<QtMoc Include="Debugger\Breakpoints\BreakpointDialog.h" />
<QtMoc Include="Debugger\Breakpoints\BreakpointModel.h" />
<QtMoc Include="Debugger\Breakpoints\BreakpointWidget.h" />
<QtMoc Include="Debugger\Breakpoints\BreakpointView.h" />
<QtMoc Include="Debugger\Docking\DockLayout.h" />
<QtMoc Include="Debugger\Docking\DockManager.h" />
<QtMoc Include="Debugger\Docking\DockMenuBar.h" />
@ -250,10 +250,10 @@
<QtMoc Include="Debugger\Docking\DropIndicators.h" />
<QtMoc Include="Debugger\Docking\LayoutEditorDialog.h" />
<QtMoc Include="Debugger\Docking\NoLayoutsWidget.h" />
<QtMoc Include="Debugger\Memory\MemorySearchWidget.h" />
<QtMoc Include="Debugger\Memory\MemoryViewWidget.h" />
<QtMoc Include="Debugger\Memory\MemorySearchView.h" />
<QtMoc Include="Debugger\Memory\MemoryView.h" />
<QtMoc Include="Debugger\Memory\SavedAddressesModel.h" />
<QtMoc Include="Debugger\Memory\SavedAddressesWidget.h" />
<QtMoc Include="Debugger\Memory\SavedAddressesView.h" />
<QtMoc Include="Settings\ControllerBindingWidget.h" />
<QtMoc Include="Settings\ControllerGlobalSettingsWidget.h" />
<ClInclude Include="Settings\MemoryCardConvertWorker.h" />
@ -305,31 +305,31 @@
<ClCompile Include="$(IntDir)Debugger\moc_AnalysisOptionsDialog.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_DebuggerView.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_DebuggerWindow.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_DisassemblyWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_RegisterWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_DisassemblyView.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_RegisterView.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_StackModel.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_StackWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_StackView.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_ThreadModel.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_ThreadWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\moc_ThreadView.cpp" />
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointDialog.cpp" />
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointModel.cpp" />
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointView.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_DockManager.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_DockMenuBar.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_DockViews.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_DropIndicators.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_LayoutEditorDialog.cpp" />
<ClCompile Include="$(IntDir)Debugger\Docking\moc_NoLayoutsWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemorySearchWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemoryViewWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemorySearchView.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemoryView.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesModel.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesWidget.cpp" />
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesView.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_NewSymbolDialogs.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeDelegates.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeLocation.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeModel.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeNode.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeWidgets.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeViews.cpp" />
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_TypeString.cpp" />
<ClCompile Include="$(IntDir)GameList\moc_GameListModel.cpp" />
<ClCompile Include="$(IntDir)GameList\moc_GameListRefreshThread.cpp" />
@ -356,19 +356,19 @@
<QtUi Include="CoverDownloadDialog.ui" />
<QtUi Include="Debugger\AnalysisOptionsDialog.ui" />
<QtUi Include="Debugger\Breakpoints\BreakpointDialog.ui" />
<QtUi Include="Debugger\Breakpoints\BreakpointWidget.ui" />
<QtUi Include="Debugger\Breakpoints\BreakpointView.ui" />
<QtUi Include="Debugger\DebuggerWindow.ui" />
<QtUi Include="Debugger\DisassemblyWidget.ui" />
<QtUi Include="Debugger\DisassemblyView.ui" />
<QtUi Include="Debugger\Docking\LayoutEditorDialog.ui" />
<QtUi Include="Debugger\Docking\NoLayoutsWidget.ui" />
<QtUi Include="Debugger\Memory\MemorySearchWidget.ui" />
<QtUi Include="Debugger\Memory\MemoryViewWidget.ui" />
<QtUi Include="Debugger\Memory\SavedAddressesWidget.ui" />
<QtUi Include="Debugger\RegisterWidget.ui" />
<QtUi Include="Debugger\StackWidget.ui" />
<QtUi Include="Debugger\Memory\MemorySearchView.ui" />
<QtUi Include="Debugger\Memory\MemoryView.ui" />
<QtUi Include="Debugger\Memory\SavedAddressesView.ui" />
<QtUi Include="Debugger\RegisterView.ui" />
<QtUi Include="Debugger\StackView.ui" />
<QtUi Include="Debugger\SymbolTree\NewSymbolDialog.ui" />
<QtUi Include="Debugger\SymbolTree\SymbolTreeWidget.ui" />
<QtUi Include="Debugger\ThreadWidget.ui" />
<QtUi Include="Debugger\SymbolTree\SymbolTreeView.ui" />
<QtUi Include="Debugger\ThreadView.ui" />
<QtUi Include="GameList\EmptyGameListWidget.ui" />
<QtUi Include="GameList\GameListWidget.ui" />
<QtUi Include="MainWindow.ui" />

154
pcsx2-qt/pcsx2-qt.vcxproj.filters
View File

@ -290,24 +290,12 @@
<ClCompile Include="Debugger\DebuggerWindow.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\DisassemblyWidget.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\RegisterWidget.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\StackModel.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\StackWidget.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\ThreadModel.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\ThreadWidget.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_AnalysisOptionsDialog.cpp">
<Filter>moc</Filter>
</ClCompile>
@ -317,31 +305,19 @@
<ClCompile Include="$(IntDir)Debugger\moc_DebuggerWindow.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_DisassemblyWidget.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_RegisterWidget.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_StackModel.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_StackWidget.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_ThreadModel.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_ThreadWidget.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointDialog.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointModel.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointWidget.cpp">
<ClCompile Include="$(IntDir)Debugger\Breakpoints\moc_BreakpointView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Docking\moc_DockManager.cpp">
@ -359,16 +335,16 @@
<ClCompile Include="$(IntDir)Debugger\Docking\moc_NoLayoutsWidget.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemorySearchWidget.cpp">
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemorySearchView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemoryViewWidget.cpp">
<ClCompile Include="$(IntDir)Debugger\Memory\moc_MemoryView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesModel.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesWidget.cpp">
<ClCompile Include="$(IntDir)Debugger\Memory\moc_SavedAddressesView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="ColorPickerButton.cpp" />
@ -415,9 +391,6 @@
<ClCompile Include="Debugger\SymbolTree\SymbolTreeNode.cpp">
<Filter>Debugger\SymbolTree</Filter>
</ClCompile>
<ClCompile Include="Debugger\SymbolTree\SymbolTreeWidgets.cpp">
<Filter>Debugger\SymbolTree</Filter>
</ClCompile>
<ClCompile Include="Debugger\SymbolTree\TypeString.cpp">
<Filter>Debugger\SymbolTree</Filter>
</ClCompile>
@ -428,7 +401,7 @@
<ClCompile Include="Debugger\Breakpoints\BreakpointModel.cpp">
<Filter>Debugger\Breakpoints</Filter>
</ClCompile>
<ClCompile Include="Debugger\Breakpoints\BreakpointWidget.cpp">
<ClCompile Include="Debugger\Breakpoints\BreakpointView.cpp">
<Filter>Debugger\Breakpoints</Filter>
</ClCompile>
<ClCompile Include="Debugger\Docking\DockLayout.cpp">
@ -452,13 +425,13 @@
<ClCompile Include="Debugger\Memory\SavedAddressesModel.cpp">
<Filter>Debugger\Memory</Filter>
</ClCompile>
<ClCompile Include="Debugger\Memory\SavedAddressesWidget.cpp">
<ClCompile Include="Debugger\Memory\SavedAddressesView.cpp">
<Filter>Debugger\Memory</Filter>
</ClCompile>
<ClCompile Include="Debugger\Memory\MemorySearchWidget.cpp">
<ClCompile Include="Debugger\Memory\MemorySearchView.cpp">
<Filter>Debugger\Memory</Filter>
</ClCompile>
<ClCompile Include="Debugger\Memory\MemoryViewWidget.cpp">
<ClCompile Include="Debugger\Memory\MemoryView.cpp">
<Filter>Debugger\Memory</Filter>
</ClCompile>
<ClCompile Include="Debugger\Docking\LayoutEditorDialog.cpp">
@ -482,9 +455,6 @@
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeNode.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeWidgets.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_TypeString.cpp">
<Filter>moc</Filter>
</ClCompile>
@ -494,6 +464,36 @@
<ClCompile Include="Debugger\Docking\DockMenuBar.cpp">
<Filter>Debugger\Docking</Filter>
</ClCompile>
<ClCompile Include="Debugger\StackView.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\SymbolTree\SymbolTreeViews.cpp">
<Filter>Debugger\SymbolTree</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_DisassemblyView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_RegisterView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_StackView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\SymbolTree\moc_SymbolTreeViews.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Debugger\moc_ThreadView.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="Debugger\DisassemblyView.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\RegisterView.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="Debugger\ThreadView.cpp">
<Filter>Debugger</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\pcsx2\windows\PCSX2.manifest">
@ -634,24 +634,12 @@
<QtMoc Include="Debugger\DebuggerWindow.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\DisassemblyWidget.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\RegisterWidget.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\StackModel.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\StackWidget.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\ThreadModel.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\ThreadWidget.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="ColorPickerButton.h" />
<QtMoc Include="SetupWizardDialog.h" />
<QtMoc Include="Settings\GameCheatSettingsWidget.h">
@ -668,7 +656,7 @@
<QtMoc Include="Debugger\Breakpoints\BreakpointModel.h">
<Filter>Debugger\Breakpoints</Filter>
</QtMoc>
<QtMoc Include="Debugger\Breakpoints\BreakpointWidget.h">
<QtMoc Include="Debugger\Breakpoints\BreakpointView.h">
<Filter>Debugger\Breakpoints</Filter>
</QtMoc>
<QtMoc Include="Debugger\Docking\DockLayout.h">
@ -689,9 +677,6 @@
<QtMoc Include="Debugger\Docking\DropIndicators.h">
<Filter>Debugger\Docking</Filter>
</QtMoc>
<QtMoc Include="Debugger\SymbolTree\SymbolTreeWidgets.h">
<Filter>Debugger\SymbolTree</Filter>
</QtMoc>
<QtMoc Include="Debugger\SymbolTree\SymbolTreeDelegates.h">
<Filter>Debugger\SymbolTree</Filter>
</QtMoc>
@ -707,13 +692,13 @@
<QtMoc Include="Debugger\Memory\SavedAddressesModel.h">
<Filter>Debugger\Memory</Filter>
</QtMoc>
<QtMoc Include="Debugger\Memory\SavedAddressesWidget.h">
<QtMoc Include="Debugger\Memory\SavedAddressesView.h">
<Filter>Debugger\Memory</Filter>
</QtMoc>
<QtMoc Include="Debugger\Memory\MemorySearchWidget.h">
<QtMoc Include="Debugger\Memory\MemorySearchView.h">
<Filter>Debugger\Memory</Filter>
</QtMoc>
<QtMoc Include="Debugger\Memory\MemoryViewWidget.h">
<QtMoc Include="Debugger\Memory\MemoryView.h">
<Filter>Debugger\Memory</Filter>
</QtMoc>
<QtMoc Include="Debugger\Docking\LayoutEditorDialog.h">
@ -728,6 +713,21 @@
<QtMoc Include="Debugger\Docking\DockMenuBar.h">
<Filter>Debugger\Docking</Filter>
</QtMoc>
<QtMoc Include="Debugger\StackView.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\SymbolTree\SymbolTreeViews.h">
<Filter>Debugger\SymbolTree</Filter>
</QtMoc>
<QtMoc Include="Debugger\DisassemblyView.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\RegisterView.h">
<Filter>Debugger</Filter>
</QtMoc>
<QtMoc Include="Debugger\ThreadView.h">
<Filter>Debugger</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<QtResource Include="resources\resources.qrc">
@ -738,7 +738,7 @@
<QtUi Include="Debugger\Breakpoints\BreakpointDialog.ui">
<Filter>Debugger\Breakpoints</Filter>
</QtUi>
<QtUi Include="Debugger\Breakpoints\BreakpointWidget.ui">
<QtUi Include="Debugger\Breakpoints\BreakpointView.ui">
<Filter>Debugger\Breakpoints</Filter>
</QtUi>
<QtUi Include="Debugger\Docking\LayoutEditorDialog.ui">
@ -747,39 +747,24 @@
<QtUi Include="Debugger\Docking\NoLayoutsWidget.ui">
<Filter>Debugger\Docking</Filter>
</QtUi>
<QtUi Include="Debugger\Memory\MemorySearchWidget.ui">
<QtUi Include="Debugger\Memory\MemorySearchView.ui">
<Filter>Debugger\Memory</Filter>
</QtUi>
<QtUi Include="Debugger\Memory\MemoryViewWidget.ui">
<QtUi Include="Debugger\Memory\MemoryView.ui">
<Filter>Debugger\Memory</Filter>
</QtUi>
<QtUi Include="Debugger\Memory\SavedAddressesWidget.ui">
<QtUi Include="Debugger\Memory\SavedAddressesView.ui">
<Filter>Debugger\Memory</Filter>
</QtUi>
<QtUi Include="Debugger\SymbolTree\NewSymbolDialog.ui">
<Filter>Debugger\SymbolTree</Filter>
</QtUi>
<QtUi Include="Debugger\SymbolTree\SymbolTreeWidget.ui">
<Filter>Debugger\SymbolTree</Filter>
</QtUi>
<QtUi Include="Debugger\AnalysisOptionsDialog.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\DebuggerWindow.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\DisassemblyWidget.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\RegisterWidget.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\StackWidget.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\ThreadWidget.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="GameList\EmptyGameListWidget.ui">
<Filter>GameList</Filter>
</QtUi>
@ -953,10 +938,25 @@
<QtUi Include="CoverDownloadDialog.ui" />
<QtUi Include="MainWindow.ui" />
<QtUi Include="SetupWizardDialog.ui" />
<QtUi Include="Debugger\StackView.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\SymbolTree\SymbolTreeView.ui">
<Filter>Debugger\SymbolTree</Filter>
</QtUi>
<QtUi Include="Debugger\DisassemblyView.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\RegisterView.ui">
<Filter>Debugger</Filter>
</QtUi>
<QtUi Include="Debugger\ThreadView.ui">
<Filter>Debugger</Filter>
</QtUi>
</ItemGroup>
<ItemGroup>
<QtTs Include="Translations\pcsx2-qt_en.ts">
<Filter>Translations</Filter>
</QtTs>
</ItemGroup>
</Project>
</Project>