diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-05-22 12:53:44 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-05-22 13:29:45 +0200 |
| commit | 6e322a92c8ad2f5b1dd58d092605de852b125a36 (patch) | |
| tree | e0f7f8b9b23e5f628d88921c1f7115c049419816 | |
| parent | f65e2035abfbd2660ed91d7882a2bdcd9301db0a (diff) | |
tracker/{aruco,ht,pt}: camera dialog class doesn't use a template now.
Adjust usages.
| -rw-r--r-- | tracker-aruco/ftnoir_tracker_aruco.h | 2 | ||||
| -rw-r--r-- | tracker-ht/ftnoir_tracker_ht.h | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt_dialog.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h index b9503c6e..bef27ac7 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.h +++ b/tracker-aruco/ftnoir_tracker_aruco.h @@ -70,7 +70,7 @@ private: cv::Vec3d t; }; -class TrackerControls : public ITrackerDialog, protected camera_dialog<Tracker> +class TrackerControls : public ITrackerDialog, protected camera_dialog { Q_OBJECT public: diff --git a/tracker-ht/ftnoir_tracker_ht.h b/tracker-ht/ftnoir_tracker_ht.h index 0563fe1c..1ec3467a 100644 --- a/tracker-ht/ftnoir_tracker_ht.h +++ b/tracker-ht/ftnoir_tracker_ht.h @@ -60,7 +60,7 @@ private: volatile bool should_stop; }; -class TrackerControls : public ITrackerDialog, protected camera_dialog<Tracker> +class TrackerControls : public ITrackerDialog, protected camera_dialog { Q_OBJECT public: diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 5f30c66f..2cf63771 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -32,7 +32,7 @@ class TrackerDialog_PT; class Tracker_PT : public QThread, public ITracker { Q_OBJECT - friend class camera_dialog<Tracker_PT>; + friend class camera_dialog; friend class TrackerDialog_PT; public: Tracker_PT(); diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h index 3502e227..b992e98d 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.h +++ b/tracker-pt/ftnoir_tracker_pt_dialog.h @@ -20,7 +20,7 @@ //----------------------------------------------------------------------------- // The dialog that shows up when the user presses "Settings" -class TrackerDialog_PT : public ITrackerDialog, protected camera_dialog<Tracker_PT> +class TrackerDialog_PT : public ITrackerDialog, protected camera_dialog { Q_OBJECT public: |