Index: src/ch/FeedbackHandler.cpp
===================================================================
diff -u -N -r25b3c85ea493809ee084271d5101a015d349da95 -r458af7bf8c35950fdeb4b906950437596324aea1
--- src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision 25b3c85ea493809ee084271d5101a015d349da95)
+++ src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision 458af7bf8c35950fdeb4b906950437596324aea1)
@@ -33,7 +33,6 @@
 
 CFeedbackHandler::~CFeedbackHandler()
 {
-
 }
 
 ull_t CFeedbackHandler::RequestFeedback(ull_t ullFeedbackID, ptr_t pFeedbackParam)
@@ -128,22 +127,17 @@
 	return eFeedbackResult;
 }
 
-void CFeedbackHandler::Delete()
+chcore::IFeedbackHandlerPtr CFeedbackHandlerFactory::Create()
 {
-	delete this;
+	return chcore::IFeedbackHandlerPtr(new CFeedbackHandler);
 }
 
-chcore::IFeedbackHandler* CFeedbackHandlerFactory::Create()
+CFeedbackHandlerFactory::CFeedbackHandlerFactory()
 {
-	return new CFeedbackHandler;
-}
 
-chcore::IFeedbackHandlerFactory* CFeedbackHandlerFactory::CreateFactory()
-{
-	return new CFeedbackHandlerFactory;
 }
 
-void CFeedbackHandlerFactory::Delete()
+CFeedbackHandlerFactory::~CFeedbackHandlerFactory()
 {
-	delete this;
+
 }