From b89699c7551f768bf4ff47820543f8c7b8c794af Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 4 Nov 2016 19:15:54 +0100
Subject: modules: make names unique

---
 tracker-rift-140/dialog.cpp    | 6 +++---
 tracker-rift-140/dialog.ui     | 4 ++--
 tracker-rift-140/impl.cpp      | 2 +-
 tracker-rift-140/lang/pl_PL.ts | 2 +-
 tracker-rift-140/lang/ru_RU.ts | 2 +-
 tracker-rift-140/rift-140.hpp  | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tracker-rift-140')

diff --git a/tracker-rift-140/dialog.cpp b/tracker-rift-140/dialog.cpp
index a6bf8126..bd6ac46c 100644
--- a/tracker-rift-140/dialog.cpp
+++ b/tracker-rift-140/dialog.cpp
@@ -1,7 +1,7 @@
 #include "rift-140.hpp"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_rift_140::dialog_rift_140()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.useYawSpring, ui.yawSpring);
 }
 
-void TrackerControls::doOK() {
+void dialog_rift_140::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_rift_140::doCancel() {
     close();
 }
 
diff --git a/tracker-rift-140/dialog.ui b/tracker-rift-140/dialog.ui
index 20c8f00b..6fe583c3 100644
--- a/tracker-rift-140/dialog.ui
+++ b/tracker-rift-140/dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UIRiftControls</class>
- <widget class="QWidget" name="UIRiftControls">
+ <class>dialog_rift_140</class>
+ <widget class="QWidget" name="dialog_rift_140">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-rift-140/impl.cpp b/tracker-rift-140/impl.cpp
index 964858ac..67d5bb47 100644
--- a/tracker-rift-140/impl.cpp
+++ b/tracker-rift-140/impl.cpp
@@ -94,4 +94,4 @@ void Rift_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_140, rift_140Dll)
diff --git a/tracker-rift-140/lang/pl_PL.ts b/tracker-rift-140/lang/pl_PL.ts
index 29c051ea..cc49d21d 100644
--- a/tracker-rift-140/lang/pl_PL.ts
+++ b/tracker-rift-140/lang/pl_PL.ts
@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="pl_PL">
 <context>
-    <name>UIRiftControls</name>
+    <name>dialog_rift_140</name>
     <message>
         <location filename="../dialog.ui" line="+23"/>
         <source>Oculus Rift tracker settings FaceTrackNoIR</source>
diff --git a/tracker-rift-140/lang/ru_RU.ts b/tracker-rift-140/lang/ru_RU.ts
index 84d12da1..33e80935 100644
--- a/tracker-rift-140/lang/ru_RU.ts
+++ b/tracker-rift-140/lang/ru_RU.ts
@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
-    <name>UIRiftControls</name>
+    <name>dialog_rift_140</name>
     <message>
         <location filename="../dialog.ui" line="+23"/>
         <source>Oculus Rift tracker settings FaceTrackNoIR</source>
diff --git a/tracker-rift-140/rift-140.hpp b/tracker-rift-140/rift-140.hpp
index 912f8587..22b2b383 100644
--- a/tracker-rift-140/rift-140.hpp
+++ b/tracker-rift-140/rift-140.hpp
@@ -34,24 +34,24 @@ private:
     settings s;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_rift_140: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_rift_140();
 
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 
 private:
-    Ui::UIRiftControls ui;
+    Ui::dialog_rift_140 ui;
     settings s;
 private slots:
     void doOK();
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class rift_140Dll : public Metadata
 {
 public:
     QString name() { return QString("Oculus Rift runtime 1.4.0 -- HMD"); }
-- 
cgit v1.2.3