1 files changed, 29 insertions, 34 deletions

diff --git a/proto-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h
index 4f0bf5a7..9b52a053 100644
--- a/proto-mouse/ftnoir_protocol_mouse.h
+++ b/proto-mouse/ftnoir_protocol_mouse.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015 Stanislaw Halik <sthalik@misaki.pl>
+/* Copyright (c) 2015, 2019 Stanislaw Halik <sthalik@misaki.pl>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -8,57 +8,52 @@
 #pragma once
 
 #include "ui_ftnoir_mousecontrols.h"
-#include <QDebug>
+
+#include "mouse-settings.hpp"
 #include "api/plugin-api.hpp"
-#include "options/options.hpp"
-using namespace options;
 
-struct settings : opts {
-    value<int> Mouse_X, Mouse_Y;
-    value<slider_value> sensitivity_x, sensitivity_y;
-    settings() :
-        opts("mouse-proto"),
-        Mouse_X(b, "mouse-x", 0),
-        Mouse_Y(b, "mouse-y", 0),
-        sensitivity_x(b, "mouse-sensitivity-x", slider_value(200, 25, 500)),
-        sensitivity_y(b, "mouse-sensitivity-y", slider_value(200, 25, 500))
-    {}
-};
+#include <QDebug>
+
+using namespace options;
 
-class mouse : public IProtocol
+class mouse : public TR, public IProtocol
 {
-public:
-    mouse();
-    bool correct() override;
-    void pose( const double *headpose) override;
-    QString game_name() override;
+    Q_OBJECT
 
-    int last_x, last_y;
-private:
     static int get_delta(int val, int prev);
     static int get_value(double val, double sensitivity, bool is_rotation);
 
-    struct settings s;
+    int last_x = 0, last_y = 0;
+    mouse_settings s;
+
+public:
+    mouse() = default;
+    module_status initialize() override { return status_ok(); }
+    void pose(const double* headpose, const double*) override;
+    QString game_name() override;
 };
 
 class MOUSEControls: public IProtocolDialog
 {
     Q_OBJECT
-public:
-    MOUSEControls();
-    void register_protocol(IProtocol *) {}
-    void unregister_protocol() {}
-private:
-    Ui::UICMOUSEControls ui;
-    settings s;
+
+    Ui::UI_mouse ui;
+    mouse_settings s;
+
 private slots:
     void doOK();
     void doCancel();
+
+public:
+    MOUSEControls();
+    void register_protocol(IProtocol*) override {}
+    void unregister_protocol() override {}
 };
 
 class mouseDll : public Metadata
 {
-public:
-    QString name() { return QString(QCoreApplication::translate("mouseDll", "mouse emulation")); }
-    QIcon icon() { return QIcon(":/images/mouse.png"); }
+    Q_OBJECT
+
+    QString name() override { return tr("mouse emulation"); }
+    QIcon icon() override { return QIcon(":/images/mouse.png"); }
 };