Merge pull request #9331 from leoetlino/deprecation-fixes

Qt: Fix deprecated use of MidButton
dolphin-emu · Dec 17, 2020 · ac25256 · ac25256
2 parents 5eb64cc + 6018525
commit ac25256
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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;
 
@@ -149,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
@@ -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});