summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp2
-rw-r--r--ftnoir_filter_kalman/kalman.cpp2
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn.h2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h11
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.h3
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.h7
6 files changed, 9 insertions, 18 deletions
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
index 7201ba37..d1f06a64 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
@@ -15,7 +15,7 @@
* *
********************************************************************************/
#include "ftnoir_filter_ewma2.h"
-#include "math.h"
+#include <cmath>
#include <QDebug>
#include <QWidget>
#include "facetracknoir/plugin-support.h"
diff --git a/ftnoir_filter_kalman/kalman.cpp b/ftnoir_filter_kalman/kalman.cpp
index 81ee1df2..1f2ebb3b 100644
--- a/ftnoir_filter_kalman/kalman.cpp
+++ b/ftnoir_filter_kalman/kalman.cpp
@@ -7,7 +7,7 @@
#include "ftnoir_filter_kalman.h"
#include "facetracknoir/plugin-support.h"
#include <QDebug>
-#include <math.h>
+#include <cmath>
FTNoIR_Filter::FTNoIR_Filter() {
reset();
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
index 2e3c270a..498df50c 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
@@ -33,7 +33,7 @@
#include <QThread>
#include <QUdpSocket>
#include <QMessageBox>
-#include <math.h>
+#include <cmath>
#include "facetracknoir/plugin-support.h"
#include "facetracknoir/options.h"
using namespace options;
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
index c36b15f3..b63a5492 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
@@ -28,13 +28,8 @@
#pragma once
#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
#include "ui_ftnoir_vjoy_controls.h"
-#include <QThread>
-#include <QUdpSocket>
-#include <QMessageBox>
-#include <QSettings>
-#include <math.h>
+#include <cmath>
#include "facetracknoir/plugin-support.h"
-#include <windows.h>
#define FT_PROGRAMID "FT_ProgramID"
@@ -60,7 +55,7 @@ class VJoyControls: public QWidget, public IProtocolDialog
public:
explicit VJoyControls();
- void registerProtocol(IProtocol *l) {}
+ void registerProtocol(IProtocol *) {}
void unRegisterProtocol() {}
private:
@@ -89,6 +84,8 @@ public:
#define VJOY_AXIS_NIL 0
#define VJOY_AXIS_MAX 32767
+#include <windows.h>
+
#include <pshpack1.h>
typedef struct _JOYSTICK_STATE
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
index 7819dd67..fdfc2643 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
@@ -1,8 +1,5 @@
#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
#include "ui_ftnoir_hydra_clientcontrols.h"
-#include <QMessageBox>
-#include <QWaitCondition>
-#include <math.h>
#include "facetracknoir/plugin-support.h"
#include "facetracknoir/options.h"
using namespace options;
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index c093c940..22c9c465 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -1,11 +1,8 @@
#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
#include "ui_ftnoir_ftnclientcontrols.h"
-#include <QThread>
#include <QUdpSocket>
-#include <QMessageBox>
-#include <QMutex>
-#include <QWaitCondition>
-#include <math.h>
+#include <QThread>
+#include <cmath>
#include "facetracknoir/plugin-support.h"
#include "facetracknoir/options.h"
using namespace options;