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.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt.h') diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h index 349cf2c8..771631cd 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h @@ -33,12 +33,12 @@ //----------------------------------------------------------------------------- // Constantly processes the tracking chain in a separate thread -class Tracker : public QThread, public ITracker +class Tracker_PT : public QThread, public ITracker { Q_OBJECT public: - Tracker(); - ~Tracker() override; + Tracker_PT(); + ~Tracker_PT() override; void start_tracker(QFrame* parent_window) override; void data(double* data) override; @@ -69,7 +69,7 @@ private: PTVideoWidget* video_widget; QFrame* video_frame; - settings s; + settings_pt s; Timer time; volatile bool ever_success; -- cgit v1.2.3