From 4c5c3904a55a748f3453f5b067e2d6d0f0a11848 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 16 Jun 2015 08:50:03 +0200 Subject: pt: rename for consistency with trackhat We're going to merge to trackhat often so let's not introduce needless conflicts. PT headers need to be include-able. --- ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h') 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; -- cgit v1.2.3