get rid of evil CALLING_CONVENTION macro

57 files changed, 133 insertions, 156 deletions

diff --git a/facetracknoir/plugin-api.hpp b/facetracknoir/plugin-api.hpp
index d458d25c..f352a6a9 100644
--- a/facetracknoir/plugin-api.hpp
+++ b/facetracknoir/plugin-api.hpp
@@ -2,12 +2,6 @@
 
 #include "facetracknoir/export.hpp"
 
-#if defined(_WIN32)
-#   define CALLING_CONVENTION __stdcall
-#else
-#   define CALLING_CONVENTION
-#endif
-
 enum Axis {
     TX = 0, TY, TZ, Yaw, Pitch, Roll
 };
diff --git a/facetracknoir/plugin-support.cpp b/facetracknoir/plugin-support.cpp
index c6622fe0..35cf8f29 100644
--- a/facetracknoir/plugin-support.cpp
+++ b/facetracknoir/plugin-support.cpp
@@ -1,11 +1,8 @@
+#include <cstdio>
 #include "plugin-support.h"
 #include <QCoreApplication>
 #include <QFile>
 
-#if !(defined(_WIN32))
-#   include <dlfcn.h>
-#endif
-
 SelectedLibraries* Libraries = NULL;
 
 SelectedLibraries::~SelectedLibraries()
@@ -88,15 +85,15 @@ DynamicLibrary::DynamicLibrary(const QString& filename) :
     if (_foo::die(handle, !handle->load()))
         return;
     
-    Dialog = (DIALOG_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetDialog" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION);
+    Dialog = (DIALOG_FUNPTR) handle->resolve("GetDialog");
     if (_foo::die(handle, !Dialog))
         return;
     
-    Constructor = (CTOR_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetConstructor" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION);
+    Constructor = (CTOR_FUNPTR) handle->resolve("GetConstructor");
     if (_foo::die(handle, !Constructor))
         return;
     
-    Metadata = (METADATA_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetMetadata" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION);
+    Metadata = (METADATA_FUNPTR) handle->resolve("GetMetadata");
     if (_foo::die(handle, !Metadata))
         return;
 #else
diff --git a/facetracknoir/plugin-support.h b/facetracknoir/plugin-support.h
index 1e02bd60..3924fc09 100644
--- a/facetracknoir/plugin-support.h
+++ b/facetracknoir/plugin-support.h
@@ -2,20 +2,6 @@
 
 #include "facetracknoir/plugin-api.hpp"
 
-#if defined(_WIN32)
-#   define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION "@0"
-#   ifdef _MSC_VER
-#       error "No support for MSVC anymore"
-#else
-#       define MAYBE_STDCALL_UNDERSCORE ""
-#   endif
-#else
-#   define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION ""
-#   define MAYBE_STDCALL_UNDERSCORE ""
-#endif
-
-#include <cstdio>
-
 #include <QWidget>
 #include <QDebug>
 #include <QString>
@@ -38,9 +24,9 @@ extern SelectedLibraries* Libraries;
 
 struct Metadata;
 
-extern "C" typedef void* (CALLING_CONVENTION * CTOR_FUNPTR)(void);
-extern "C" typedef Metadata* (CALLING_CONVENTION* METADATA_FUNPTR)(void);
-extern "C" typedef void* (CALLING_CONVENTION* DIALOG_FUNPTR)(void);
+extern "C" typedef void* (*CTOR_FUNPTR)(void);
+extern "C" typedef Metadata* (*METADATA_FUNPTR)(void);
+extern "C" typedef void* (*DIALOG_FUNPTR)(void);
 
 class DynamicLibrary {
 public:
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index b7aee77c..9b7b2cb2 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -1,67 +1,67 @@
-/* Copyright (c) 2012-2013 Stanislaw Halik

- *

- * Permission to use, copy, modify, and/or distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- */

-#include "ftnoir_filter_accela/ftnoir_filter_accela.h"

-#include <algorithm>

-#include <cmath>

-#include <QDebug>

-#include <QMutexLocker>

-#include "facetracknoir/plugin-support.h"

-using namespace std;

-

-FTNoIR_Filter::FTNoIR_Filter() : first_run(true)

-{

-}

-

-static inline double parabola(const double a, const double x, const double dz, const double expt)

-{

-    const double sign = x > 0 ? 1 : -1;

-    const double a1 = 1./a;

-    return a1 * pow(std::max<double>(fabs(x) - dz, 0), expt) * sign;

-}

-

-void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,

-                                       double *new_camera_position)

-{

-	if (first_run)

-	{

-        for (int i = 0; i < 6; i++)

-        {

-            new_camera_position[i] = target_camera_position[i];

-            for (int j = 0; j < 3; j++)

-                last_output[j][i] = target_camera_position[i];

-        }

-

-        first_run = false;

-		return;

-	}

-

-    for (int i=0;i<6;i++)

-	{

-        const double vec = target_camera_position[i] - last_output[0][i];

-        const double vec2 = target_camera_position[i] - last_output[1][i];

-        const double vec3 = target_camera_position[i] - last_output[2][i];

-		const int sign = vec < 0 ? -1 : 1;

-        const double a = i >= 3 ? s.rotation_alpha : s.translation_alpha;

-        const double a2 = a * s.second_order_alpha;

-        const double a3 = a * s.third_order_alpha;

-        const double deadzone = i >= 3 ? s.rot_deadzone : s.trans_deadzone;

-        const double velocity =

-                parabola(a, vec, deadzone, s.expt) +

-                parabola(a2, vec2, deadzone, s.expt) +

-                parabola(a3, vec3, deadzone, s.expt);

-        const double result = last_output[0][i] + velocity;

-        const bool done = sign > 0 ? result >= target_camera_position[i] : result <= target_camera_position[i];

-        last_output[2][i] = last_output[1][i];

-        last_output[1][i] = last_output[0][i];

-        last_output[0][i] = new_camera_position[i] = done ? target_camera_position[i] : result;

-	}

-}

-

-extern "C" OPENTRACK_EXPORT IFilter* CALLING_CONVENTION GetConstructor()

-{

-    return new FTNoIR_Filter;

-}

+/* Copyright (c) 2012-2013 Stanislaw Halik
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+#include "ftnoir_filter_accela/ftnoir_filter_accela.h"
+#include <algorithm>
+#include <cmath>
+#include <QDebug>
+#include <QMutexLocker>
+#include "facetracknoir/plugin-support.h"
+using namespace std;
+
+FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
+{
+}
+
+static inline double parabola(const double a, const double x, const double dz, const double expt)
+{
+    const double sign = x > 0 ? 1 : -1;
+    const double a1 = 1./a;
+    return a1 * pow(std::max<double>(fabs(x) - dz, 0), expt) * sign;
+}
+
+void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,
+                                       double *new_camera_position)
+{
+	if (first_run)
+	{
+        for (int i = 0; i < 6; i++)
+        {
+            new_camera_position[i] = target_camera_position[i];
+            for (int j = 0; j < 3; j++)
+                last_output[j][i] = target_camera_position[i];
+        }
+
+        first_run = false;
+		return;
+	}
+
+    for (int i=0;i<6;i++)
+	{
+        const double vec = target_camera_position[i] - last_output[0][i];
+        const double vec2 = target_camera_position[i] - last_output[1][i];
+        const double vec3 = target_camera_position[i] - last_output[2][i];
+		const int sign = vec < 0 ? -1 : 1;
+        const double a = i >= 3 ? s.rotation_alpha : s.translation_alpha;
+        const double a2 = a * s.second_order_alpha;
+        const double a3 = a * s.third_order_alpha;
+        const double deadzone = i >= 3 ? s.rot_deadzone : s.trans_deadzone;
+        const double velocity =
+                parabola(a, vec, deadzone, s.expt) +
+                parabola(a2, vec2, deadzone, s.expt) +
+                parabola(a3, vec3, deadzone, s.expt);
+        const double result = last_output[0][i] + velocity;
+        const bool done = sign > 0 ? result >= target_camera_position[i] : result <= target_camera_position[i];
+        last_output[2][i] = last_output[1][i];
+        last_output[1][i] = last_output[0][i];
+        last_output[0][i] = new_camera_position[i] = done ? target_camera_position[i] : result;
+	}
+}
+
+extern "C" OPENTRACK_EXPORT IFilter* GetConstructor()
+{
+    return new FTNoIR_Filter;
+}
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
index 7afcd014..965cb3ea 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
@@ -52,7 +52,7 @@ void FilterControls::save() {
         accela_filter->receiveSettings();
 }
 
-extern "C" OPENTRACK_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog()
+extern "C" OPENTRACK_EXPORT IFilterDialog* GetDialog()
 {
     return new FilterControls;
 }
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
index e908b873..65bee314 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_filter_accela.h"
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_FilterDll;
 }
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
index 810cfef9..c7169faa 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
@@ -91,7 +91,7 @@ void FTNoIR_Filter::FilterHeadPoseData(const double *target_camera_position,
     }
 }
 
-extern "C" OPENTRACK_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IFilter* GetConstructor()
 {
     return new FTNoIR_Filter;
 }
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
index 9e89bdb7..a32875b9 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
@@ -43,7 +43,7 @@ void FilterControls::save() {
         pFilter->receiveSettings();
 }
 
-extern "C" OPENTRACK_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IFilterDialog* GetDialog( )
 {
     return new FilterControls;
 }
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
index 9a5a9148..5ec6138a 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_filter_ewma2.h"
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_FilterDll;
 }
diff --git a/ftnoir_filter_kalman/kalman.cpp b/ftnoir_filter_kalman/kalman.cpp
index cb622d79..70bbba8d 100644
--- a/ftnoir_filter_kalman/kalman.cpp
+++ b/ftnoir_filter_kalman/kalman.cpp
@@ -121,16 +121,16 @@ void FilterControls::doCancel() {
     close();
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_FilterDll;
 }
 
-extern "C" OPENTRACK_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IFilter* GetConstructor()
 {
     return new FTNoIR_Filter;
 }
 
-extern "C" OPENTRACK_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog() {
+extern "C" OPENTRACK_EXPORT IFilterDialog* GetDialog() {
     return new FilterControls;
 }
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index 45293796..b2d29118 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -57,7 +57,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
     return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
index eb8b9a81..1aa67b43 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -63,7 +63,7 @@ void FGControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new FGControls;
 }
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
index a1f065c7..f830f8f7 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
@@ -26,7 +26,7 @@
 #include <QDebug>
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
index f5e6d5ea..822cdb4d 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -158,7 +158,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
 	return true;
 }
 
-extern "C" OPENTRACK_EXPORT FTNoIR_Protocol* CALLING_CONVENTION GetConstructor(void)
+extern "C" OPENTRACK_EXPORT FTNoIR_Protocol* GetConstructor(void)
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
index e8c04dfe..d2af714f 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
@@ -56,7 +56,7 @@ void FSUIPCControls::getLocationOfDLL()
     }
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog(void)
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog(void)
 {
     return new FSUIPCControls;
 }
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
index b2cd6e02..dbea2c46 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
@@ -25,7 +25,7 @@
 #include "ftnoir_protocol_fsuipc.h"
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata(void)
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata(void)
 {
 	return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
index 8b8be63d..5c365697 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
@@ -171,7 +171,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
 	return true;
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
index 626d5358..654f6c18 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
@@ -73,7 +73,7 @@ void FTControls::selectDLL() {
     }
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog()
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog()
 {
     return new FTControls;
 }
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp
index d6f05bad..d7a13fa5 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp
@@ -1,7 +1,7 @@
 #include "facetracknoir/plugin-support.h"
 #include "ftnoir_protocol_ft/ftnoir_protocol_ft.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
index 4ee7362b..ccff1ba5 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
@@ -48,7 +48,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
     return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
index b4a92b39..cab5b4ba 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
@@ -56,7 +56,7 @@ void FTNControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new FTNControls;
 }
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp
index da89a9ca..0d24ccf8 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp
@@ -25,7 +25,7 @@
 #include "ftnoir_protocol_ftn.h"
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
index ca395b34..1840fa03 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
@@ -94,7 +94,7 @@ void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
     (void) libevdev_uinput_write_event(uidev, EV_SYN, SYN_REPORT, 0);
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
index 152095d4..d522610b 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
@@ -20,7 +20,7 @@ void LibevdevControls::doCancel() {
 void LibevdevControls::save() {
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new LibevdevControls;
 }
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
index 01f7ff5f..e258b077 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
@@ -10,7 +10,7 @@ FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
 
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index f78eb16d..47f7a67e 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -63,7 +63,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
     return true;
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index 50ea8f2e..4b12a4f0 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -63,7 +63,7 @@ void MOUSEControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new MOUSEControls;
 }
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
index 50f889db..39bdf6e5 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
@@ -25,7 +25,7 @@
 #include "ftnoir_protocol_mouse.h"
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
index 0901546a..72b800d2 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
@@ -246,7 +246,7 @@ void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData
     }
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
index 8845bec6..cd8c21f9 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
@@ -48,7 +48,7 @@ void SCControls::doCancel() {
     close();
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new SCControls;
 }
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
index 6effb6d5..9bdbef09 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
@@ -26,7 +26,7 @@
 #include <QDebug>
 #include "facetracknoir/plugin-support.h"
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
index 2b8aa017..58fa2ab1 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
@@ -28,7 +28,7 @@ void FTNoIR_Protocol::sendHeadposeToGame( const double *headpose ) {
     VJoy_UpdateJoyState(0, state);
 }
 
-extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
 {
     return new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
index 440b12dc..6bd82d9a 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
@@ -20,7 +20,7 @@ void VJoyControls::doCancel() {
 void VJoyControls::save() {
 }
 
-extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new VJoyControls;
 }
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
index 812a2af9..367a0df6 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
@@ -10,7 +10,7 @@ FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
 
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index 8ebc394d..29a2a70c 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
@@ -56,7 +56,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
     return lck_shm.success();
 }
 
-extern "C" OPENTRACK_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT void* GetConstructor()
 {
     return (IProtocol*) new FTNoIR_Protocol;
 }
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
index bcd3df45..c092de42 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
@@ -17,7 +17,7 @@ void FTControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT void* GetDialog( )
 {
     return (IProtocolDialog*) new FTControls;
 }
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp
index 16e3e7c7..c6e3d433 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp
@@ -9,7 +9,7 @@ FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
 {
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_ProtocolDll;
 }
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index b27b96b8..97830c9a 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -421,19 +421,19 @@ void TrackerDll::getIcon(QIcon *icon)
 //-----------------------------------------------------------------------------
 //#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new TrackerDll;
 }
 
 //#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new Tracker;
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
index c1faebeb..39b1f4a2 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
@@ -97,7 +97,7 @@ void TrackerImpl::GetHeadPoseData(double *data)
     data[Roll] = pose[Roll];
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new TrackerImpl;
 }
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
index ee6c4284..5a0cade4 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
@@ -21,7 +21,7 @@ void TrackerDialog::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog()
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog()
 {
     return new TrackerDialog;
 }
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp
index 7578150f..afcc8c6e 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp
@@ -21,7 +21,7 @@ void TrackerMeta::getIcon(QIcon *icon)
     *icon = QIcon(":/glovepie.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new TrackerMeta;
 }
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 15bf3a76..05eb116c 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -229,17 +229,17 @@ void TrackerDll::getIcon(QIcon *icon)
     *icon = QIcon(":/images/ht.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new TrackerDll;
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new Tracker;
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
index 03c756f9..42de16c1 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
@@ -45,7 +45,7 @@ void Hydra_Tracker::GetHeadPoseData(double *data)
     data[Roll] = ypr[2] * r2d;
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new Hydra_Tracker;
 }
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
index 80b5fb22..dbd9981f 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
@@ -21,7 +21,7 @@ void TrackerControls::doCancel() {
     close();
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
index 8388ddfe..18efea05 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
@@ -23,7 +23,7 @@ void FTNoIR_TrackerDll::getIcon(QIcon *icon)
     *icon = QIcon(":/images/facetracknoir.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_TrackerDll;
 }
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
index 9b98d4be..bb1076dd 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
@@ -200,7 +200,7 @@ void FTNoIR_Tracker::GetHeadPoseData(double *data)
         data[i] = values[i] * limits[i] / AXIS_MAX;
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new FTNoIR_Tracker;
 }
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
index 67e480a3..4ddbcb0c 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -53,7 +53,7 @@ void TrackerControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
index 075ed555..af1a9679 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
@@ -22,7 +22,7 @@ void FTNoIR_TrackerDll::getIcon(QIcon *icon)
     *icon = QIcon(":/images/facetracknoir.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
     return new FTNoIR_TrackerDll;
 }
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index 768a3a71..7e5ccc6c 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -245,7 +245,7 @@ void Tracker::GetHeadPoseData(THeadPoseData *data)
 
 //-----------------------------------------------------------------------------
 #ifdef OPENTRACK_API
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 #else
 #pragma comment(linker, "/export:GetTracker=_GetTracker@0")
 OPENTRACK_EXPORT ITrackerPtr __stdcall GetTracker()
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index 0e58a2e4..9529e268 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -290,7 +290,7 @@ void TrackerDialog::unRegisterTracker()
 	//ui.center_button->setEnabled(false);
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
 	return new TrackerDialog;
 }
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
index 07e1d9e7..fb756a86 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
@@ -32,7 +32,7 @@ void TrackerDll::getIcon(QIcon *icon)
 
 #ifdef OPENTRACK_API
 #   include "facetracknoir/plugin-support.h"
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 #else
 #   pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
 OPENTRACK_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index 1cca6075..4198a4b8 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -67,7 +67,7 @@ void Rift_Tracker::GetHeadPoseData(double *data)
     }
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new Rift_Tracker;
 }
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
index c95ce364..a66eb83b 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
@@ -25,7 +25,7 @@ void TrackerControls::doCancel() {
     close();
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog()
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog()
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
index 22eec9b9..902c8051 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
@@ -35,7 +35,7 @@ void FTNoIR_TrackerDll::getIcon(QIcon *icon)
     *icon = QIcon(":/images/rift_tiny.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_TrackerDll;
 }
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
index 6253529d..136e075d 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
@@ -36,7 +36,7 @@ void FTNoIR_Tracker::GetHeadPoseData(double *data)
         data[i] = last_recv_pose[i];
 }
 
-extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
 {
     return new FTNoIR_Tracker;
 }
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
index 59683ddc..b0f40ee9 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
@@ -22,7 +22,7 @@ void TrackerControls::doCancel() {
     this->close();
 }
 
-extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp
index 525a618f..7cd23552 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp
@@ -21,7 +21,7 @@ void FTNoIR_TrackerDll::getIcon(QIcon *icon)
     *icon = QIcon(":/images/facetracknoir.png");
 }
 
-extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_TrackerDll;
 }