summaryrefslogtreecommitdiff
path: root/src/yuzu/bootmanager.h
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-09-20 19:39:08 -0500
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-24 20:30:23 -0600
commit737d305f6324d28a7fde882077fb7e9a0e66311f (patch)
treeb5023523b599a330633303e6b5c95d18d5653ca4 /src/yuzu/bootmanager.h
parent29ae42f3e2c297898d88858861f7d860ce9fc2f3 (diff)
yuzu: Use new input on main and bootmanager
Diffstat (limited to 'src/yuzu/bootmanager.h')
-rw-r--r--src/yuzu/bootmanager.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index f0784046b..95594f81c 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -30,11 +30,8 @@ class System;
namespace InputCommon {
class InputSubsystem;
-}
-
-namespace MouseInput {
enum class MouseButton;
-}
+} // namespace InputCommon
namespace VideoCore {
enum class LoadCallbackStage;
@@ -165,7 +162,7 @@ public:
void keyReleaseEvent(QKeyEvent* event) override;
/// Converts a Qt mouse button into MouseInput mouse button
- // static MouseInput::MouseButton QtButtonToMouseButton(Qt::MouseButton button);
+ static InputCommon::MouseButton QtButtonToMouseButton(Qt::MouseButton button);
void mousePressEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
@@ -214,7 +211,7 @@ private:
void TouchUpdateEvent(const QTouchEvent* event);
void TouchEndEvent();
- bool TouchStart(const QTouchEvent::TouchPoint& touch_point);
+ void TouchStart(const QTouchEvent::TouchPoint& touch_point);
bool TouchUpdate(const QTouchEvent::TouchPoint& touch_point);
bool TouchExist(std::size_t id, const QList<QTouchEvent::TouchPoint>& touch_points) const;