From b89699c7551f768bf4ff47820543f8c7b8c794af Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 4 Nov 2016 19:15:54 +0100 Subject: modules: make names unique --- tracker-rift-042/ftnoir_rift_clientcontrols_042.ui | 4 ++-- tracker-rift-042/ftnoir_tracker_rift_042.cpp | 2 +- tracker-rift-042/ftnoir_tracker_rift_042.h | 8 ++++---- tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tracker-rift-042') diff --git a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui index 20c8f00b..2b3316fd 100644 --- a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui +++ b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui @@ -1,7 +1,7 @@ - UIRiftControls - + dialog_rift_042 + Qt::NonModal diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_042.cpp index 1b819328..af8a386f 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_042.cpp @@ -87,4 +87,4 @@ void Rift_Tracker::data(double *data) } } -OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll) +OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_042, rift_042Dll) diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.h b/tracker-rift-042/ftnoir_tracker_rift_042.h index 69c5487e..103db3cc 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_042.h +++ b/tracker-rift-042/ftnoir_tracker_rift_042.h @@ -34,24 +34,24 @@ private: settings s; }; -class TrackerControls: public ITrackerDialog +class dialog_rift_042: public ITrackerDialog { Q_OBJECT public: - TrackerControls(); + dialog_rift_042(); void register_tracker(ITracker *) {} void unregister_tracker() {} private: - Ui::UIRiftControls ui; + Ui::dialog_rift_042 ui; settings s; private slots: void doOK(); void doCancel(); }; -class FTNoIR_TrackerDll : public Metadata +class rift_042Dll : public Metadata { public: QString name() { return QString("Oculus Rift runtime 0.4.2 -- HMD"); } diff --git a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp index f520b4b5..032c3c63 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp @@ -1,7 +1,7 @@ #include "ftnoir_tracker_rift_042.h" #include "api/plugin-api.hpp" -TrackerControls::TrackerControls() +dialog_rift_042::dialog_rift_042() { ui.setupUi( this ); @@ -14,12 +14,12 @@ TrackerControls::TrackerControls() tie_setting(s.useYawSpring, ui.yawSpring); } -void TrackerControls::doOK() { +void dialog_rift_042::doOK() { s.b->save(); close(); } -void TrackerControls::doCancel() { +void dialog_rift_042::doCancel() { close(); } -- cgit v1.2.3