1 files changed, 19 insertions, 10 deletions
diff --git a/src/yuzu/configuration/configure_motion_touch.h b/src/yuzu/configuration/configure_motion_touch.h
index 1a4f50022..2a7cdfed7 100644
--- a/src/yuzu/configuration/configure_motion_touch.h
+++ b/src/yuzu/configuration/configure_motion_touch.h
@@ -7,29 +7,30 @@
 #include <memory>
 #include <QDialog>
 #include "common/param_package.h"
-#include "core/settings.h"
-#include "input_common/udp/client.h"
-#include "input_common/udp/udp.h"
 
-class QVBoxLayout;
 class QLabel;
 class QPushButton;
+class QVBoxLayout;
 
 namespace Ui {
 class ConfigureMotionTouch;
 }
 
+namespace InputCommon::CemuhookUDP {
+class CalibrationConfigurationJob;
+}
+
 /// A dialog for touchpad calibration configuration.
 class CalibrationConfigurationDialog : public QDialog {
     Q_OBJECT
 public:
     explicit CalibrationConfigurationDialog(QWidget* parent, const std::string& host, u16 port,
                                             u8 pad_index, u16 client_id);
-    ~CalibrationConfigurationDialog();
+    ~CalibrationConfigurationDialog() override;
 
 private:
-    Q_INVOKABLE void UpdateLabelText(QString text);
-    Q_INVOKABLE void UpdateButtonText(QString text);
+    Q_INVOKABLE void UpdateLabelText(const QString& text);
+    Q_INVOKABLE void UpdateButtonText(const QString& text);
 
     QVBoxLayout* layout;
     QLabel* status_label;
@@ -38,7 +39,10 @@ private:
 
     // Configuration results
     bool completed{};
-    u16 min_x, min_y, max_x, max_y;
+    u16 min_x{};
+    u16 min_y{};
+    u16 max_x{};
+    u16 max_y{};
 
     friend class ConfigureMotionTouch;
 };
@@ -47,7 +51,7 @@ class ConfigureMotionTouch : public QDialog {
     Q_OBJECT
 
 public:
-    explicit ConfigureMotionTouch(QWidget* parent = nullptr);
+    explicit ConfigureMotionTouch(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_);
     ~ConfigureMotionTouch() override;
 
 public slots:
@@ -69,9 +73,14 @@ private:
     std::unique_ptr<Ui::ConfigureMotionTouch> ui;
 
     // Coordinate system of the CemuhookUDP touch provider
-    int min_x, min_y, max_x, max_y;
+    int min_x{};
+    int min_y{};
+    int max_x{};
+    int max_y{};
 
     bool udp_test_in_progress{};
 
+    InputCommon::InputSubsystem* input_subsystem;
+
     std::vector<Settings::TouchFromButtonMap> touch_from_button_maps;
 };