1 files changed, 19 insertions, 18 deletions

diff --git a/proto-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h
index 2b88ae1d..b7cf61cf 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
@@ -10,49 +10,50 @@
 #include "ui_ftnoir_mousecontrols.h"
 
 #include "mouse-settings.hpp"
-#include "compat/tr.hpp"
+#include "api/plugin-api.hpp"
 
 #include <QDebug>
-#include "api/plugin-api.hpp"
+
 using namespace options;
 
 class mouse : public TR, public IProtocol
 {
     Q_OBJECT
 
+    static int get_delta(int val, int prev);
+    static int get_value(double val, double sensitivity, bool is_rotation);
+
+    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) override;
     QString game_name() override;
-
-    int last_x = 0, last_y = 0;
-private:
-    static int get_delta(int val, int prev);
-    static int get_value(double val, double sensitivity, bool is_rotation);
-
-    struct mouse_settings s;
 };
 
 class MOUSEControls: public IProtocolDialog
 {
     Q_OBJECT
-public:
-    MOUSEControls();
-    void register_protocol(IProtocol *) {}
-    void unregister_protocol() {}
-private:
-    Ui::UICMOUSEControls ui;
+
+    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
 {
     Q_OBJECT
 
-    QString name() { return tr("mouse emulation"); }
-    QIcon icon() { return QIcon(":/images/mouse.png"); }
+    QString name() override { return tr("mouse emulation"); }
+    QIcon icon() override { return QIcon(":/images/mouse.png"); }
 };