summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-10-08 07:21:14 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-10-08 07:21:14 +0200
commit12665c035359e70056cb0a1d9ec7bf364976c152 (patch)
treee46de919ed8dd29e0f5f0049335fa96b9314125c
parent80525e48bce10a629db7706fe1dc31c2e0402354 (diff)
fix clang warningsopentrack-2.3-rc19
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h10
-rw-r--r--ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h8
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h9
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.h10
4 files changed, 19 insertions, 18 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 9691a75c..436602a1 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -52,9 +52,9 @@ class Tracker : protected QThread, public ITracker
public:
Tracker();
~Tracker() override;
- void start_tracker(QFrame* frame);
- void data(double *data);
- void run();
+ void start_tracker(QFrame* frame) override;
+ void data(double *data) override;
+ void run() override;
void getRT(cv::Matx33d &r, cv::Vec3d &t);
private:
cv::VideoCapture camera;
@@ -75,8 +75,8 @@ class TrackerControls : public ITrackerDialog, protected camera_dialog<Tracker>
Q_OBJECT
public:
TrackerControls();
- void register_tracker(ITracker * x) { tracker = static_cast<Tracker*>(x); }
- void unregister_tracker() { tracker = nullptr; }
+ void register_tracker(ITracker * x) override { tracker = static_cast<Tracker*>(x); }
+ void unregister_tracker() override { tracker = nullptr; }
private:
Ui::Form ui;
Tracker* tracker;
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
index 5a70026c..7cff2ec9 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
@@ -33,8 +33,8 @@ class TrackerImpl : public ITracker, private QThread
public:
TrackerImpl();
~TrackerImpl() override;
- void start_tracker(QFrame *);
- void data(double *data);
+ void start_tracker(QFrame *) override;
+ void data(double *data) override;
protected:
void run() override;
private:
@@ -50,8 +50,8 @@ class TrackerDialog : public ITrackerDialog
Q_OBJECT
public:
TrackerDialog();
- void register_tracker(ITracker *) {}
- void unregister_tracker() {}
+ void register_tracker(ITracker *) override {}
+ void unregister_tracker() override {}
private:
Ui::UI_freepie_udp_dialog ui;
settings s;
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:
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index 8dca3833..6de5b295 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -23,9 +23,9 @@ class FTNoIR_Tracker : public ITracker, protected QThread
{
public:
FTNoIR_Tracker();
- ~FTNoIR_Tracker();
- void start_tracker(QFrame *);
- void data(double *data);
+ ~FTNoIR_Tracker() override;
+ void start_tracker(QFrame *) override;
+ void data(double *data) override;
protected:
void run() override;
private:
@@ -41,8 +41,8 @@ class TrackerControls: public ITrackerDialog
Q_OBJECT
public:
TrackerControls();
- void register_tracker(ITracker *) {}
- void unregister_tracker() {}
+ void register_tracker(ITracker *) override {}
+ void unregister_tracker() override {}
private:
Ui::UICFTNClientControls ui;
settings s;