summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_ht/ftnoir_tracker_ht.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-08 06:57:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-08 06:57:48 +0200
commit78e20c5173ae722ddac1499df25e40a3ab6d0f3e (patch)
tree6640b38855e081824e8fc04bc8a723fa560d28fc /ftnoir_tracker_ht/ftnoir_tracker_ht.h
parent527eef2a2f0e68b286e1b782ba148ecdfafbb89c (diff)
parent027fd0f8b4efcf005a0bba850109089737f40a3f (diff)
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_ht/ftnoir_tracker_ht.h')
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index 25839039..348fc246 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -37,7 +37,7 @@ class Tracker : public QObject, public ITracker
{
Q_OBJECT
public:
- Tracker();
+ Tracker();
~Tracker() override;
void start_tracker(QFrame* frame);
void data(double *data);
@@ -46,9 +46,9 @@ private:
settings s;
PortableLockedShm lck_shm;
ht_shm_t* shm;
- QProcess subprocess;
+ QProcess subprocess;
HTVideoWidget* videoWidget;
- QHBoxLayout* layout;
+ QHBoxLayout* layout;
};
// Widget that has controls for FTNoIR protocol client-settings.
@@ -56,17 +56,17 @@ class TrackerControls : public ITrackerDialog, protected camera_dialog<Tracker>
{
Q_OBJECT
public:
- explicit TrackerControls();
+ explicit TrackerControls();
void register_tracker(ITracker *) {}
void unregister_tracker() {}
private:
- Ui::Form ui;
+ Ui::Form ui;
settings s;
private slots:
- void doOK();
- void doCancel();
+ void doOK();
+ void doCancel();
void camera_settings();
};