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-080 | |
| parent | 068e0c7d432ede0a388fe1478b5146fcf1809315 (diff) | |
modules: make names unique
Diffstat (limited to 'tracker-rift-080')
| -rw-r--r-- | tracker-rift-080/ftnoir_rift_clientcontrols_080.ui | 4 | ||||
| -rw-r--r-- | tracker-rift-080/ftnoir_tracker_rift_080.cpp | 2 | ||||
| -rw-r--r-- | tracker-rift-080/ftnoir_tracker_rift_080.h | 8 | ||||
| -rw-r--r-- | tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp | 6 | 
4 files changed, 10 insertions, 10 deletions
diff --git a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui b/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui index 20c8f00b..d348fd35 100644 --- a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui +++ b/tracker-rift-080/ftnoir_rift_clientcontrols_080.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_080</class> + <widget class="QWidget" name="dialog_rift_080">    <property name="windowModality">     <enum>Qt::NonModal</enum>    </property> diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp index a7d09035..35a268f2 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_080.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_080, rift_080Dll) diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h index 139c480f..e1283226 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.h +++ b/tracker-rift-080/ftnoir_tracker_rift_080.h @@ -33,24 +33,24 @@ private:      settings s;  }; -class TrackerControls: public ITrackerDialog +class dialog_rift_080: public ITrackerDialog  {      Q_OBJECT  public: -    TrackerControls(); +    dialog_rift_080();      void register_tracker(ITracker *) {}      void unregister_tracker() {}  private: -    Ui::UIRiftControls ui; +    Ui::dialog_rift_080 ui;      settings s;  private slots:      void doOK();      void doCancel();  }; -class FTNoIR_TrackerDll : public Metadata +class rift_080Dll : public Metadata  {  public:      QString name() { return QString("Oculus Rift runtime 0.8.0 -- HMD"); } diff --git a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp index aba4f6bf..27eb54e4 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp @@ -1,7 +1,7 @@  #include "ftnoir_tracker_rift_080.h"  #include "api/plugin-api.hpp" -TrackerControls::TrackerControls() +dialog_rift_080::dialog_rift_080()  {      ui.setupUi( this ); @@ -14,12 +14,12 @@ TrackerControls::TrackerControls()      tie_setting(s.useYawSpring, ui.yawSpring);  } -void TrackerControls::doOK() { +void dialog_rift_080::doOK() {      s.b->save();      close();  } -void TrackerControls::doCancel() { +void dialog_rift_080::doCancel() {      close();  }  | 
