modules: make names unique

3 files changed, 15 insertions, 15 deletions

diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index fff060d6..498b4e42 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -9,7 +9,7 @@
 #include "api/plugin-api.hpp"
 #include <QMutexLocker>
 
-FTNoIR_Tracker::FTNoIR_Tracker()
+joystick::joystick()
 {
     if (static_cast<QString>(s.guid) == "")
     {
@@ -22,15 +22,15 @@ FTNoIR_Tracker::FTNoIR_Tracker()
     }
 }
 
-FTNoIR_Tracker::~FTNoIR_Tracker()
+joystick::~joystick()
 {
 }
 
-void FTNoIR_Tracker::start_tracker(QFrame*)
+void joystick::start_tracker(QFrame*)
 {
 }
 
-void FTNoIR_Tracker::data(double *data)
+void joystick::data(double *data)
 {
     int map[6] = {
         s.joy_1 - 1,
@@ -68,4 +68,4 @@ void FTNoIR_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(joystick, dialog_joystick, joystickDll)
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index a7e8fddd..3a5175ed 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -36,11 +36,11 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Tracker : public ITracker
+class joystick : public ITracker
 {
 public:
-    FTNoIR_Tracker();
-    ~FTNoIR_Tracker();
+    joystick();
+    ~joystick();
     void start_tracker(QFrame *);
     void data(double *data);
     settings s;
@@ -49,15 +49,15 @@ public:
     win32_joy_ctx joy_ctx;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_joystick: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_joystick();
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
     Ui::UIJoystickControls ui;
-    FTNoIR_Tracker* tracker;
+    joystick* tracker;
     settings s;
     struct joys {
         QString name;
@@ -69,7 +69,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class joystickDll : public Metadata
 {
 public:
     QString name() { return QString("Joystick input"); }
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 1d67cdbb..aa4b783a 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_joystick.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls() : tracker(nullptr)
+dialog_joystick::dialog_joystick() : tracker(nullptr)
 {
     ui.setupUi( this );
 
@@ -39,7 +39,7 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     tie_setting(s.joy_6, ui.joy_6);
 }
 
-void TrackerControls::doOK() {
+void dialog_joystick::doOK() {
     int idx = ui.joylist->currentIndex();
     joys def { "", "" };
     auto val = _joys.value(idx, def);
@@ -48,6 +48,6 @@ void TrackerControls::doOK() {
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_joystick::doCancel() {
     close();
 }