summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-29 16:04:58 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-29 16:04:58 +0200
commit0522ef2ec6de1bc35721613ded92c832930e9a9e (patch)
treed4b7ca32558895da812733af8d48f94ab34bbd95
parent6fdcf9004e0aafb796592ab5120f1bd90190e2c3 (diff)
Correct prototypes
-rw-r--r--ftnoir_filter_accela/ftnoir_filter_accela.cpp4
-rw-r--r--ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp4
-rw-r--r--ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp4
-rw-r--r--ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp4
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.cpp4
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp4
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp4
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp4
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.cpp4
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp4
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp4
-rw-r--r--ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp4
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp4
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp4
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc.cpp4
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp4
-rw-r--r--ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.cpp4
-rw-r--r--ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dialog.cpp4
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp8
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt.cpp4
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp4
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.cpp4
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp4
-rw-r--r--ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp4
-rw-r--r--ftnoir_tracker_sm/ftnoir_tracker_faceapi_dialog.cpp4
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.cpp4
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp4
27 files changed, 56 insertions, 56 deletions
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index cfd98742..41bb93dc 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -137,7 +137,7 @@ void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position,
// Win32 API function.
// _GetFilter@0 - Common name decoration for __stdcall functions in C language.
-extern "C" FTNOIR_FILTER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
{
- return (IFilter*) new FTNoIR_Filter;
+ 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 f9fdcb6f..e863ce9f 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp
@@ -192,7 +192,7 @@ void FilterControls::save() {
// _GetFilterDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetFilterDialog=_GetFilterDialog@0")
-extern "C" FTNOIR_FILTER_BASE_EXPORT void* CALLING_CONVENTION GetDialog()
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog()
{
- return (IFilterDialog*) new FilterControls;
+ return new FilterControls;
}
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
index c08b7e23..933a39e9 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
@@ -192,7 +192,7 @@ void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position, double *
// _GetFilter@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetFilter=_GetFilter@0")
-extern "C" FTNOIR_FILTER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
{
- return (IFilter*) new FTNoIR_Filter;
+ 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 3e0fdb25..694bed88 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp
@@ -193,7 +193,7 @@ void FilterControls::save() {
// _GetFilterDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetFilterDialog=_GetFilterDialog@0")
-extern "C" FTNOIR_FILTER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_FILTER_BASE_EXPORT IFilterDialog* CALLING_CONVENTION GetDialog( )
{
- return (IFilterDialog*) new FilterControls;
+ return new FilterControls;
}
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index e15f5965..0f420883 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -233,7 +233,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
- return (IProtocol*) new FTNoIR_Protocol;
+ 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 9867ea2f..2c3de324 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -215,7 +215,7 @@ void FGControls::chkLocalPCOnlyChanged() {
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
- return (IProtocolDialog*) new FGControls;
+ return new FGControls;
}
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
index b3d7acaa..1cec9460 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -216,7 +216,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor(void)
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT FTNoIR_Protocol* CALLING_CONVENTION GetConstructor(void)
{
- return (FTNoIR_Protocol*) new FTNoIR_Protocol;
+ 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 eca04985..3e7cb578 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
@@ -192,7 +192,7 @@ void FSUIPCControls::getLocationOfDLL()
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog(void)
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog(void)
{
- return (IProtocolDialog*) new FSUIPCControls;
+ return new FSUIPCControls;
}
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
index 6b67fd38..1fb4c658 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
@@ -406,7 +406,7 @@ void FTNoIR_Protocol::FTDestroyMapping()
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
- return (IProtocol*) new FTNoIR_Protocol;
+ 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 ffdd7ddd..65c4f3cf 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
@@ -227,7 +227,7 @@ void FTControls::selectDLL() {
// GetProtocolDialog - Undecorated name, which can be easily used with GetProcAddress
// Win32 API function.
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
- return (IProtocolDialog*) new FTControls;
+ return new FTControls;
}
diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
index 424dc5aa..50806ca7 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp
@@ -123,7 +123,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
- return (IProtocol*) new FTNoIR_Protocol;
+ 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 24ccc8b9..7bc116ef 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
@@ -187,7 +187,7 @@ void FTNControls::save() {
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
- return (IProtocolDialog*) new FTNControls;
+ return new FTNControls;
}
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index de31cd79..d5e0ac63 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -169,7 +169,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
- return (IProtocol*) new FTNoIR_Protocol;
+ 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 263be205..45d5ba2e 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -230,7 +230,7 @@ void MOUSEControls::save() {
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
- return (IProtocolDialog*) new MOUSEControls;
+ return new MOUSEControls;
}
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
index 9d2fb498..c6de92eb 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
@@ -368,7 +368,7 @@ void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData
// _GetProtocol@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
- return (IProtocol*) new FTNoIR_Protocol;
+ 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 ef9dd924..38ca9605 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
@@ -152,7 +152,7 @@ void SCControls::save() {
// _GetProtocolDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
- return (IProtocolDialog*) new SCControls;
+ return new SCControls;
}
diff --git a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.cpp b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.cpp
index e7ef4c0f..2e3cd8e2 100644
--- a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.cpp
+++ b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.cpp
@@ -250,7 +250,7 @@ void FTNoIR_Tracker::loadSettings() {
// _GetTracker@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new FTNoIR_Tracker;
+ return new FTNoIR_Tracker;
}
diff --git a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dialog.cpp b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dialog.cpp
index 0cb486fe..c47db85f 100644
--- a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dialog.cpp
+++ b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dialog.cpp
@@ -162,7 +162,7 @@ void TrackerControls::save() {
// _GetTrackerDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
{
- return (ITrackerDialog*) new TrackerControls;
+ return new TrackerControls;
}
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 5c5f7386..b925b6c2 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -291,9 +291,9 @@ extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new Tracker;
+ return new Tracker;
}
////////////////////////////////////////////////////////////////////////////////
@@ -305,9 +305,9 @@ extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
// _GetTrackerDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
{
- return (ITrackerDialog*) new TrackerControls;
+ return new TrackerControls;
}
void TrackerControls::cameraSettings() {
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index f18671e2..d468dd85 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -255,7 +255,7 @@ bool Tracker::GiveHeadPoseData(double *data)
//-----------------------------------------------------------------------------
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new Tracker;
+ return new Tracker;
}
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index c1067ba7..4837f4a9 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -331,7 +331,7 @@ void TrackerDialog::unRegisterTracker()
//-----------------------------------------------------------------------------
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
{
- return (ITrackerDialog*) new TrackerDialog;
+ return new TrackerDialog;
}
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index 769ca460..f1688fb5 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -136,7 +136,7 @@ void Rift_Tracker::loadSettings() {
// _GetTracker@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new Rift_Tracker;
+ 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 ca82d5e3..fd35f37e 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
@@ -177,7 +177,7 @@ void TrackerControls::save() {
// _GetTrackerDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
{
- return (ITrackerDialog*) new TrackerControls;
+ return new TrackerControls;
}
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp b/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
index 81be669a..3f4bebe8 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
+++ b/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
@@ -167,7 +167,7 @@ void FTNoIR_Tracker::loadSettings() {
// _GetTracker@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new FTNoIR_Tracker;
+ return new FTNoIR_Tracker;
}
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dialog.cpp b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dialog.cpp
index 74c721dd..d327b7a9 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dialog.cpp
+++ b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dialog.cpp
@@ -341,7 +341,7 @@ void TrackerControls::doCommand(int command, int value)
// _GetTrackerDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog()
{
- return (ITrackerDialog*) new TrackerControls;
+ return new TrackerControls;
}
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
index 38ead3c0..7fc76f4a 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
@@ -167,7 +167,7 @@ void FTNoIR_Tracker::loadSettings() {
// _GetTracker@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetConstructor()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()
{
- return (ITracker*) new FTNoIR_Tracker;
+ 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 b67afc66..ceebdaf2 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
@@ -176,7 +176,7 @@ void TrackerControls::save() {
// _GetTrackerDialog@0 - Common name decoration for __stdcall functions in C language.
//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0")
-extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )
+extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
{
- return (ITrackerDialog*) new TrackerControls;
+ return new TrackerControls;
}