From efdb620783b7c166a09f5e2f2f45fd748aaab660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr> Date: Wed, 16 Dec 2020 14:43:16 +0100 Subject: [PATCH 1/2] Qt/Config: Remove unused includes --- Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp index f6f68d15ff..a3e28a204d 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp @@ -7,25 +7,17 @@ #include <QApplication> #include <QFontMetrics> #include <QMouseEvent> -#include <QRegExp> #include <QString> -#include "Common/Thread.h" -#include "Core/Core.h" - #include "DolphinQt/Config/Mapping/IOWindow.h" #include "DolphinQt/Config/Mapping/MappingCommon.h" #include "DolphinQt/Config/Mapping/MappingWidget.h" #include "DolphinQt/Config/Mapping/MappingWindow.h" -#include "DolphinQt/QtUtils/BlockUserInputFilter.h" -#include "DolphinQt/QtUtils/QueueOnObject.h" -#include "DolphinQt/Settings.h" #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/Device.h" constexpr int SLIDER_TICK_COUNT = 100; From 60185259922d904ee665f49836d93d9a2c237c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr> Date: Wed, 16 Dec 2020 14:44:25 +0100 Subject: [PATCH 2/2] Qt: Fix deprecated use of MidButton MidButton has been deprecated since Qt 4.7. The replacement is MiddleButton. --- Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | 2 +- Source/Core/DolphinQt/RenderWidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp index a3e28a204d..331f83cdfd 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp @@ -141,7 +141,7 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event) { switch (event->button()) { - case Qt::MouseButton::MidButton: + case Qt::MouseButton::MiddleButton: Clear(); return; case Qt::MouseButton::RightButton: diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp index bef9c10cbe..8200b0b9f0 100644 --- a/Source/Core/DolphinQt/RenderWidget.cpp +++ b/Source/Core/DolphinQt/RenderWidget.cpp @@ -247,7 +247,7 @@ void RenderWidget::OnFreeLookMouseMove(QMouseEvent* event) // Camera Pitch and Yaw: g_freelook_camera.Rotate(Common::Vec3{mouse_move.y() / 200.f, mouse_move.x() / 200.f, 0.f}); } - else if (event->buttons() & Qt::MidButton) + else if (event->buttons() & Qt::MiddleButton) { // Camera Roll: g_freelook_camera.Rotate({0.f, 0.f, mouse_move.x() / 200.f});