diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-11 05:46:44 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-11 05:46:44 +0200 |
| commit | 9644b25868dc3026bc4d600c029755101c629ba6 (patch) | |
| tree | c7d7bc154768ea4d3d0ccc680a252488200596cb /ftnoir_tracker_ht/ftnoir_tracker_ht.h | |
| parent | c411cbdd87afc60894704f3b6bef12471bd6db04 (diff) | |
| parent | 12665c035359e70056cb0a1d9ec7bf364976c152 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
fix clang warnings
Diffstat (limited to 'ftnoir_tracker_ht/ftnoir_tracker_ht.h')
| -rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h index 16fdbe5c..1e364456 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h @@ -44,8 +44,8 @@ public: Tracker(); ~Tracker() override; void run() override; - void start_tracker(QFrame* frame); - void data(double *data); + void start_tracker(QFrame* frame) override; + void data(double *data) override; void load_settings(ht_config_t* config); headtracker_t* ht; QMutex camera_mtx; @@ -65,11 +65,12 @@ class TrackerControls : public ITrackerDialog, protected camera_dialog<Tracker> Q_OBJECT public: TrackerControls(); - void register_tracker(ITracker * t) + void register_tracker(ITracker * t) override { tracker = static_cast<Tracker*>(t); } - void unregister_tracker() { + void unregister_tracker() override + { tracker = nullptr; } private: |