summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-06-16 09:20:06 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-06-16 09:20:06 +0200
commite4e564d4b8c43986e925996aca8cf10c6b30136e (patch)
tree54d414e8a54d6af444dbfb10d15a66a07a9d97da /ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
parentd4a35684220c9e06b64ce3d39df06616f0147bdc (diff)
parent4c5c3904a55a748f3453f5b067e2d6d0f0a11848 (diff)
Merge branch 'unstable' of github.com:opentrack/opentrack into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h')
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
index c6f7f8e1..c1cd2e3b 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
@@ -23,11 +23,11 @@
//-----------------------------------------------------------------------------
// The dialog that shows up when the user presses "Settings"
-class TrackerDialog : public ITrackerDialog
+class TrackerDialog_PT : public ITrackerDialog
{
Q_OBJECT
public:
- TrackerDialog();
+ TrackerDialog_PT();
void register_tracker(ITracker *tracker) override;
void unregister_tracker() override;
void save();
@@ -40,8 +40,8 @@ public slots:
void startstop_trans_calib(bool start);
void poll_tracker_info();
private:
- settings s;
- Tracker* tracker;
+ settings_pt s;
+ Tracker_PT* tracker;
QTimer timer;
TranslationCalibrator trans_calib;