From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 2 Apr 2013 18:41:01 +0200 Subject: Just put everything new in. Conflict resolution will be later --- ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp') diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp index a1531dd7..c1067ba7 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp @@ -9,10 +9,11 @@ #include #include +#include "facetracknoir/global-settings.h" //----------------------------------------------------------------------------- TrackerDialog::TrackerDialog() - : settings_dirty(false), tracker(NULL), timer(this), trans_calib_running(false) + : settings_dirty(false), tracker(NULL), trans_calib_running(false), timer(this) { qDebug()<<"TrackerDialog::TrackerDialog"; setAttribute(Qt::WA_DeleteOnClose, false); @@ -328,9 +329,9 @@ void TrackerDialog::unRegisterTracker() } //----------------------------------------------------------------------------- -#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0") +//#pragma comment(linker, "/export:GetTrackerDialog=_GetTrackerDialog@0") -FTNOIR_TRACKER_BASE_EXPORT ITrackerDialogPtr __stdcall GetTrackerDialog( ) +extern "C" FTNOIR_TRACKER_BASE_EXPORT void* CALLING_CONVENTION GetDialog( ) { - return new TrackerDialog; -} \ No newline at end of file + return (ITrackerDialog*) new TrackerDialog; +} -- cgit v1.2.3