diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-04 19:15:54 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-04 19:48:11 +0100 |
commit | b89699c7551f768bf4ff47820543f8c7b8c794af (patch) | |
tree | c3a21ec23a40250ec54b97fe17b9035a932cfaf8 /tracker-rift-025 | |
parent | 068e0c7d432ede0a388fe1478b5146fcf1809315 (diff) |
modules: make names unique
Diffstat (limited to 'tracker-rift-025')
-rw-r--r-- | tracker-rift-025/ftnoir_rift_clientcontrols_025.ui | 4 | ||||
-rw-r--r-- | tracker-rift-025/ftnoir_tracker_rift_025.cpp | 2 | ||||
-rw-r--r-- | tracker-rift-025/ftnoir_tracker_rift_025.h | 8 | ||||
-rw-r--r-- | tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui b/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui index 20c8f00b..a22ad85d 100644 --- a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui +++ b/tracker-rift-025/ftnoir_rift_clientcontrols_025.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_025</class> + <widget class="QWidget" name="dialog_rift_025"> <property name="windowModality"> <enum>Qt::NonModal</enum> </property> diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_025.cpp index e0ea2ad7..7c0b2a55 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_025.cpp +++ b/tracker-rift-025/ftnoir_tracker_rift_025.cpp @@ -100,4 +100,4 @@ void Rift_Tracker::data(double *data) } } -OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) +OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_025, rift_025Dll) diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.h b/tracker-rift-025/ftnoir_tracker_rift_025.h index 20b88a28..622b0722 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_025.h +++ b/tracker-rift-025/ftnoir_tracker_rift_025.h @@ -37,24 +37,24 @@ private: OVR::SensorFusion* pSFusion; }; -class TrackerControls: public ITrackerDialog +class dialog_rift_025: public ITrackerDialog { Q_OBJECT public: - TrackerControls(); + dialog_rift_025(); void register_tracker(ITracker *) {} void unregister_tracker() {} private: - Ui::UIRiftControls ui; + Ui::dialog_rift_025 ui; settings s; private slots: void doOK(); void doCancel(); }; -class FTNoIR_TrackerDll : public Metadata +class rift_025Dll : public Metadata { public: QString name() { return QString("Oculus Rift runtime 0.2.5 -- HMD"); } diff --git a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp index c3a6a198..010fc699 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp +++ b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp @@ -1,7 +1,7 @@ #include "ftnoir_tracker_rift_025.h" #include "api/plugin-api.hpp" -TrackerControls::TrackerControls() +dialog_rift_025::dialog_rift_025() { ui.setupUi( this ); @@ -14,12 +14,12 @@ TrackerControls::TrackerControls() tie_setting(s.useYawSpring, ui.yawSpring); } -void TrackerControls::doOK() { +void dialog_rift_025::doOK() { s.b->save(); close(); } -void TrackerControls::doCancel() { +void dialog_rift_025::doCancel() { close(); } |