From a6a92f7b6b3b86c18fa1dec5620a32f84dda13c5 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Thu, 4 Feb 2021 15:08:19 +0300 Subject: [PATCH] Qt: remove Q_OBJECT for mouse/kb handlers Had to move QObject in parent list for g_fxo changes. --- rpcs3/Input/basic_keyboard_handler.h | 4 ++-- rpcs3/Input/basic_mouse_handler.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Input/basic_keyboard_handler.h b/rpcs3/Input/basic_keyboard_handler.h index 4e9410ac9b..f2318451e6 100644 --- a/rpcs3/Input/basic_keyboard_handler.h +++ b/rpcs3/Input/basic_keyboard_handler.h @@ -6,9 +6,9 @@ #include #include -class basic_keyboard_handler final : public QObject, public KeyboardHandlerBase +class basic_keyboard_handler final : public KeyboardHandlerBase, public QObject { - Q_OBJECT + //Q_OBJECT public: virtual void Init(const u32 max_connect) override; diff --git a/rpcs3/Input/basic_mouse_handler.h b/rpcs3/Input/basic_mouse_handler.h index dafcc0ce90..b4b07ea6d0 100644 --- a/rpcs3/Input/basic_mouse_handler.h +++ b/rpcs3/Input/basic_mouse_handler.h @@ -7,9 +7,9 @@ #include #include -class basic_mouse_handler final : public QObject, public MouseHandlerBase +class basic_mouse_handler final : public MouseHandlerBase, public QObject { - Q_OBJECT + //Q_OBJECT public: virtual void Init(const u32 max_connect) override;