summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-22 15:14:47 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-22 15:14:47 +0200
commita42c19579c5c7a980c2826c7e015821d2e4d4b1d (patch)
treecf87d496d4646de89dbd47fa8dc5056e9cff20e0
parent5c56f7b46175d83f237846b52a99363bce8e2842 (diff)
virtual function misuse (don't create needless VPTR all over)
-rwxr-xr-xftnoir_filter_kalman/ftnoir_filter_kalman.h4
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h2
-rw-r--r--ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h2
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc.h2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h2
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h2
-rw-r--r--ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h4
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.h2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.h4
9 files changed, 12 insertions, 12 deletions
diff --git a/ftnoir_filter_kalman/ftnoir_filter_kalman.h b/ftnoir_filter_kalman/ftnoir_filter_kalman.h
index 2ff172d5..a47ebf4f 100755
--- a/ftnoir_filter_kalman/ftnoir_filter_kalman.h
+++ b/ftnoir_filter_kalman/ftnoir_filter_kalman.h
@@ -55,8 +55,8 @@ public:
show();
}
Ui::KalmanUICFilterControls ui;
- virtual void registerFilter(IFilter*) override {}
- virtual void unregisterFilter() override {}
+ void registerFilter(IFilter*) override {}
+ void unregisterFilter() override {}
public slots:
void doOK();
void doCancel();
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
index fd63ed6b..bde16d8f 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
@@ -66,7 +66,7 @@ class FTNoIR_Protocol : public IProtocol
{
public:
FTNoIR_Protocol();
- virtual ~FTNoIR_Protocol() override;
+ ~FTNoIR_Protocol() override;
bool checkServerInstallationOK();
void sendHeadposeToGame(const double* headpose);
QString getGameName() {
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
index da753238..e613885a 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
@@ -19,7 +19,7 @@ class FTNoIR_Protocol : public IProtocol
{
public:
FTNoIR_Protocol();
- virtual ~FTNoIR_Protocol();
+ ~FTNoIR_Protocol() override;
bool checkServerInstallationOK() {
return dev != NULL;
}
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
index 5a90224f..02cb7b0e 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
@@ -88,7 +88,7 @@ class FTNoIR_Protocol : public IProtocol
{
public:
FTNoIR_Protocol();
- virtual ~FTNoIR_Protocol();
+ ~FTNoIR_Protocol() override;
bool checkServerInstallationOK();
void sendHeadposeToGame(const double* headpose);
QString getGameName() {
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
index 6f30705f..eac3c610 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
@@ -36,7 +36,7 @@ class FTNoIR_Protocol : public IProtocol
{
public:
FTNoIR_Protocol();
- virtual ~FTNoIR_Protocol();
+ ~FTNoIR_Protocol() override;
bool checkServerInstallationOK() {
return true;
}
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index b953d2b4..81332a26 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -48,7 +48,7 @@ class Tracker : protected QThread, public ITracker
Q_OBJECT
public:
Tracker();
- virtual ~Tracker();
+ ~Tracker() override;
void StartTracker(QFrame* frame);
void GetHeadPoseData(double *data);
void run();
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
index 4999053d..23f3ace9 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h
@@ -25,11 +25,11 @@ class TrackerImpl : public ITracker, private QThread
{
public:
TrackerImpl();
- virtual ~TrackerImpl() override;
+ ~TrackerImpl() override;
void StartTracker(QFrame *);
void GetHeadPoseData(double *data);
protected:
- virtual void run() override;
+ void run() override;
private:
double pose[6];
QUdpSocket sock;
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
index 0049d977..1e4c6683 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
@@ -17,7 +17,7 @@ public:
~Hydra_Tracker();
void StartTracker(QFrame *) override;
void GetHeadPoseData(double *data) override;
- virtual int preferredHz() override { return 250; }
+ int preferredHz() override { return 250; }
volatile bool should_quit;
private:
settings s;
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
index 4ca99932..eb21f7bc 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
@@ -26,11 +26,11 @@ class Rift_Tracker : public ITracker
{
public:
Rift_Tracker();
- virtual ~Rift_Tracker() override;
+ ~Rift_Tracker() override;
void StartTracker(QFrame *) override;
void GetHeadPoseData(double *data) override;
- virtual int preferredHz() override { return 250; }
+ int preferredHz() override { return 250; }
volatile bool should_quit;
protected:
void run(); // qthread override run method