diff options
| author | 2021-07-05 11:23:11 -0400 | |
|---|---|---|
| committer | 2021-07-05 11:23:11 -0400 | |
| commit | dd44089f87a63c0f8ec1bc8538d900ab0637e510 (patch) | |
| tree | 671bcafaf8e679875aac354960767a7a918620a8 /src | |
| parent | Merge pull request #6552 from Morph1984/c4189-msvc (diff) | |
| parent | profiler: Fix deprecated functions (diff) | |
| download | yuzu-dd44089f87a63c0f8ec1bc8538d900ab0637e510.tar.gz yuzu-dd44089f87a63c0f8ec1bc8538d900ab0637e510.tar.xz yuzu-dd44089f87a63c0f8ec1bc8538d900ab0637e510.zip | |
Merge pull request #6559 from german77/compilation_warnings
Replace usages of deprecated member functions in QMouseEvent and QWheelEvent
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/debugger/profiler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/yuzu/debugger/profiler.cpp b/src/yuzu/debugger/profiler.cpp index efdc6aa50..7a6f84d96 100644 --- a/src/yuzu/debugger/profiler.cpp +++ b/src/yuzu/debugger/profiler.cpp | |||
| @@ -143,24 +143,25 @@ void MicroProfileWidget::hideEvent(QHideEvent* ev) { | |||
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) { | 145 | void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) { |
| 146 | MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); | 146 | MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); |
| 147 | ev->accept(); | 147 | ev->accept(); |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) { | 150 | void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) { |
| 151 | MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); | 151 | MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); |
| 152 | MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); | 152 | MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); |
| 153 | ev->accept(); | 153 | ev->accept(); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) { | 156 | void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) { |
| 157 | MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, 0); | 157 | MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0); |
| 158 | MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); | 158 | MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton); |
| 159 | ev->accept(); | 159 | ev->accept(); |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | void MicroProfileWidget::wheelEvent(QWheelEvent* ev) { | 162 | void MicroProfileWidget::wheelEvent(QWheelEvent* ev) { |
| 163 | MicroProfileMousePosition(ev->x() / x_scale, ev->y() / y_scale, ev->delta() / 120); | 163 | MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, |
| 164 | ev->angleDelta().y() / 120); | ||
| 164 | ev->accept(); | 165 | ev->accept(); |
| 165 | } | 166 | } |
| 166 | 167 | ||