Index: src/libchcore/TTask.h
===================================================================
diff -u -N -rb7655a8f0721e5454befd29e3e067748eb0521e9 -r458af7bf8c35950fdeb4b906950437596324aea1
--- src/libchcore/TTask.h	(.../TTask.h)	(revision b7655a8f0721e5454befd29e3e067748eb0521e9)
+++ src/libchcore/TTask.h	(.../TTask.h)	(revision 458af7bf8c35950fdeb4b906950437596324aea1)
@@ -21,7 +21,7 @@
 
 #include "libchcore.h"
 #include "TWorkerThreadController.h"
-#include "FeedbackHandlerBase.h"
+#include "IFeedbackHandler.h"
 #include "TTaskDefinition.h"
 #include "TTaskConfigTracker.h"
 #include "TBasePathData.h"
@@ -46,7 +46,7 @@
 class LIBCHCORE_API TTask
 {
 private:
-	TTask(const ISerializerPtr& spSerializer, IFeedbackHandler* piFeedbackHandler);
+	TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler);
 
 public:
 	~TTask();
@@ -131,7 +131,9 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 	ISerializerPtr m_spSerializer;
+	IFeedbackHandlerPtr m_spFeedbackHandler;
 #pragma warning(pop)
+
 	bool m_bWasSerialized;
 
 	// base data
@@ -188,9 +190,6 @@
 	mutable boost::shared_mutex m_lock;
 #pragma warning(pop)
 
-	/// Pointer to the feedback handler, providing responses to feedback requests
-	IFeedbackHandler* m_piFeedbackHandler;
-
 	friend class TTaskManager;
 };