diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:57:48 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:57:48 +0200 |
commit | 78e20c5173ae722ddac1499df25e40a3ab6d0f3e (patch) | |
tree | 6640b38855e081824e8fc04bc8a723fa560d28fc /ftnoir_tracker_udp/ftnoir_tracker_udp.h | |
parent | 527eef2a2f0e68b286e1b782ba148ecdfafbb89c (diff) | |
parent | 027fd0f8b4efcf005a0bba850109089737f40a3f (diff) |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_udp/ftnoir_tracker_udp.h')
-rw-r--r-- | ftnoir_tracker_udp/ftnoir_tracker_udp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h index 160e4352..95a3fb4f 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h @@ -22,12 +22,12 @@ struct settings : opts { class FTNoIR_Tracker : public ITracker, protected QThread { public: - FTNoIR_Tracker(); + FTNoIR_Tracker(); ~FTNoIR_Tracker(); void start_tracker(QFrame *); void data(double *data); protected: - void run() override; + void run() override; private: QUdpSocket sock; double last_recv_pose[6]; @@ -40,15 +40,15 @@ class TrackerControls: public ITrackerDialog { Q_OBJECT public: - TrackerControls(); + TrackerControls(); void register_tracker(ITracker *) {} void unregister_tracker() {} private: - Ui::UICFTNClientControls ui; + Ui::UICFTNClientControls ui; settings s; private slots: - void doOK(); - void doCancel(); + void doOK(); + void doCancel(); }; class FTNoIR_TrackerDll : public Metadata |