From ab0d60becc2d1b89c812193c179892d6acd4912f Mon Sep 17 00:00:00 2001 From: Patrick Ruoff Date: Fri, 21 Sep 2012 14:00:34 +0000 Subject: RAII-style dll management 1: Replaced autoptr and release with virtual destructors git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@155 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp | 7 +------ FTNoIR_Filter_Accela/ftnoir_filter_accela_dialog.cpp | 2 +- FTNoIR_Filter_Accela/ftnoir_filter_accela_dll.cpp | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'FTNoIR_Filter_Accela') diff --git a/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp b/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp index e6a009f0..60b895a4 100644 --- a/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp +++ b/FTNoIR_Filter_Accela/ftnoir_filter_accela.cpp @@ -29,11 +29,6 @@ FTNoIR_Filter::~FTNoIR_Filter() } -void FTNoIR_Filter::Release() -{ - delete this; -} - void FTNoIR_Filter::Initialize() { loadSettings(); @@ -152,7 +147,7 @@ void FTNoIR_Filter::FilterHeadPoseData(THeadPoseData *current_camera_position, T // _GetFilter@0 - Common name decoration for __stdcall functions in C language. #pragma comment(linker, "/export:GetFilter=_GetFilter@0") -FTNOIR_FILTER_BASE_EXPORT FILTERHANDLE __stdcall GetFilter() +FTNOIR_FILTER_BASE_EXPORT IFilterPtr __stdcall GetFilter() { 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 4f7a478b..b9a1724c 100644 --- a/FTNoIR_Filter_Accela/ftnoir_filter_accela_dialog.cpp +++ b/FTNoIR_Filter_Accela/ftnoir_filter_accela_dialog.cpp @@ -181,7 +181,7 @@ void FilterControls::save() { // _GetFilterDialog@0 - Common name decoration for __stdcall functions in C language. #pragma comment(linker, "/export:GetFilterDialog=_GetFilterDialog@0") -FTNOIR_FILTER_BASE_EXPORT FILTERDIALOGHANDLE __stdcall GetFilterDialog( ) +FTNOIR_FILTER_BASE_EXPORT IFilterDialogPtr __stdcall GetFilterDialog( ) { return new FilterControls; } diff --git a/FTNoIR_Filter_Accela/ftnoir_filter_accela_dll.cpp b/FTNoIR_Filter_Accela/ftnoir_filter_accela_dll.cpp index c76f2203..ccd1aaae 100644 --- a/FTNoIR_Filter_Accela/ftnoir_filter_accela_dll.cpp +++ b/FTNoIR_Filter_Accela/ftnoir_filter_accela_dll.cpp @@ -84,7 +84,7 @@ void FTNoIR_FilterDll::getIcon(QIcon *icon) // _GetFilterDll@0 - Common name decoration for __stdcall functions in C language. #pragma comment(linker, "/export:GetFilterDll=_GetFilterDll@0") -FTNOIR_FILTER_BASE_EXPORT FILTERDLLHANDLE __stdcall GetFilterDll() +FTNOIR_FILTER_BASE_EXPORT IFilterDllPtr __stdcall GetFilterDll() { return new FTNoIR_FilterDll; } -- cgit v1.2.3