OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-24 04:00:04 +00:00
Code Issues Projects Releases Wiki Activity

Rename profiler parameter names

Browse Source 
Rename the parameter names of the overriden methods to match
the qt names.
This commit is contained in:
Vitor Kiguchi 2020-08-15 11:34:56 -03:00
parent 981a4611a4
commit 7e19ed1309
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/citra_qt/debugger/profiler.cpp
View File

@ -24,17 +24,17 @@ public:
MicroProfileWidget(QWidget* parent = nullptr); MicroProfileWidget(QWidget* parent = nullptr);
protected: protected:
void paintEvent(QPaintEvent* ev) override; void paintEvent(QPaintEvent* event) override;
void showEvent(QShowEvent* ev) override; void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* ev) override; void hideEvent(QHideEvent* event) override;
void mouseMoveEvent(QMouseEvent* ev) override; void mouseMoveEvent(QMouseEvent* event) override;
void mousePressEvent(QMouseEvent* ev) override; void mousePressEvent(QMouseEvent* event) override;
void mouseReleaseEvent(QMouseEvent* ev) override; void mouseReleaseEvent(QMouseEvent* event) override;
void wheelEvent(QWheelEvent* ev) override; void wheelEvent(QWheelEvent* event) override;
void keyPressEvent(QKeyEvent* ev) override; void keyPressEvent(QKeyEvent* event) override;
void keyReleaseEvent(QKeyEvent* ev) override; void keyReleaseEvent(QKeyEvent* event) override;
private: private:
/// This timer is used to redraw the widget's contents continuously. To save resources, it only /// This timer is used to redraw the widget's contents continuously. To save resources, it only
@ -82,18 +82,18 @@ QAction* MicroProfileDialog::toggleViewAction() {
return toggle_view_action; return toggle_view_action;
} }
void MicroProfileDialog::showEvent(QShowEvent* ev) { void MicroProfileDialog::showEvent(QShowEvent* event) {
if (toggle_view_action) { if (toggle_view_action) {
toggle_view_action->setChecked(isVisible()); toggle_view_action->setChecked(isVisible());
} }
QWidget::showEvent(ev); QWidget::showEvent(event);
} }
void MicroProfileDialog::hideEvent(QHideEvent* ev) { void MicroProfileDialog::hideEvent(QHideEvent* event) {
if (toggle_view_action) { if (toggle_view_action) {
toggle_view_action->setChecked(isVisible()); toggle_view_action->setChecked(isVisible());
} }
QWidget::hideEvent(ev); QWidget::hideEvent(event);
} }
#if MICROPROFILE_ENABLED #if MICROPROFILE_ENABLED
@ -112,7 +112,7 @@ MicroProfileWidget::MicroProfileWidget(QWidget* parent) : QWidget(parent) {
connect(&update_timer, &QTimer::timeout, this, qOverload<>(&MicroProfileWidget::update)); connect(&update_timer, &QTimer::timeout, this, qOverload<>(&MicroProfileWidget::update));
} }
void MicroProfileWidget::paintEvent([[maybe_unused]] QPaintEvent* ev) { void MicroProfileWidget::paintEvent([[maybe_unused]] QPaintEvent* event) {
QPainter painter(this); QPainter painter(this);
// The units used by Microprofile for drawing are based in pixels on a 96 dpi display. // The units used by Microprofile for drawing are based in pixels on a 96 dpi display.
@ -132,51 +132,51 @@ void MicroProfileWidget::paintEvent([[maybe_unused]] QPaintEvent* ev) {
mp_painter = nullptr; mp_painter = nullptr;
} }
void MicroProfileWidget::showEvent(QShowEvent* ev) { void MicroProfileWidget::showEvent(QShowEvent* event) {
update_timer.start(15); // ~60 Hz update_timer.start(15); // ~60 Hz
QWidget::showEvent(ev); QWidget::showEvent(event);
} }
void MicroProfileWidget::hideEvent(QHideEvent* ev) { void MicroProfileWidget::hideEvent(QHideEvent* event) {
update_timer.stop(); update_timer.stop();
QWidget::hideEvent(ev); QWidget::hideEvent(event);
} }
void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) { void MicroProfileWidget::mouseMoveEvent(QMouseEvent* event) {
MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); MicroProfileMousePosition(event->x() / x_scale, event->y() / y_scale, 0);
ev->accept(); event->accept();
} }
void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) { void MicroProfileWidget::mousePressEvent(QMouseEvent* event) {
MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); MicroProfileMousePosition(event->x() / x_scale, event->y() / y_scale, 0);
MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); MicroProfileMouseButton(event->buttons() & Qt::LeftButton, event->buttons() & Qt::RightButton);
ev->accept(); event->accept();
} }
void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) { void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* event) {
MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); MicroProfileMousePosition(event->x() / x_scale, event->y() / y_scale, 0);
MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); MicroProfileMouseButton(event->buttons() & Qt::LeftButton, event->buttons() & Qt::RightButton);
ev->accept(); event->accept();
} }
void MicroProfileWidget::wheelEvent(QWheelEvent* ev) { void MicroProfileWidget::wheelEvent(QWheelEvent* event) {
MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, ev->delta() / 120); MicroProfileMousePosition(event->x() / x_scale, event->y() / y_scale, event->delta() / 120);
ev->accept(); event->accept();
} }
void MicroProfileWidget::keyPressEvent(QKeyEvent* ev) { void MicroProfileWidget::keyPressEvent(QKeyEvent* event) {
if (ev->key() == Qt::Key_Control) { if (event->key() == Qt::Key_Control) {
// Inform MicroProfile that the user is holding Ctrl. // Inform MicroProfile that the user is holding Ctrl.
MicroProfileModKey(1); MicroProfileModKey(1);
} }
QWidget::keyPressEvent(ev); QWidget::keyPressEvent(event);
} }
void MicroProfileWidget::keyReleaseEvent(QKeyEvent* ev) { void MicroProfileWidget::keyReleaseEvent(QKeyEvent* event) {
if (ev->key() == Qt::Key_Control) { if (event->key() == Qt::Key_Control) {
MicroProfileModKey(0); MicroProfileModKey(0);
} }
QWidget::keyReleaseEvent(ev); QWidget::keyReleaseEvent(event);
} }
// These functions are called by MicroProfileDraw to draw the interface elements on the screen. // These functions are called by MicroProfileDraw to draw the interface elements on the screen.

4
src/citra_qt/debugger/profiler.h
View File

@ -17,8 +17,8 @@ public:
QAction* toggleViewAction(); QAction* toggleViewAction();
protected: protected:
void showEvent(QShowEvent* ev) override; void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* ev) override; void hideEvent(QHideEvent* event) override;
private: private:
QAction* toggle_view_action = nullptr; QAction* toggle_view_action = nullptr;