Index: src/libchcore/TTask.h
===================================================================
diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -r6f8b891b60eb0f33199fd29db75d4d9f4a22c248
--- src/libchcore/TTask.h	(.../TTask.h)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
+++ src/libchcore/TTask.h	(.../TTask.h)	(revision 6f8b891b60eb0f33199fd29db75d4d9f4a22c248)
@@ -33,20 +33,23 @@
 #include "ISerializer.h"
 #include "TTaskBaseData.h"
 #include <mutex>
-#include "log.h"
 #include "IFilesystem.h"
+#include "..\Common\TLogger.h"
 
 namespace chcore
 {
 	class TBufferSizes;
 
 	///////////////////////////////////////////////////////////////////////////
 	// TTask
+	class TTask;
+	using TTaskPtr = std::shared_ptr<TTask>;
 
 	class LIBCHCORE_API TTask
 	{
 	private:
-		TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler);
+		TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskBaseData& rBaseTaskData);
+		TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskDefinition& rTaskDefinition, const TSmartPath& rLogPath);
 
 	public:
 		~TTask();
@@ -66,7 +69,7 @@
 		// thread
 		void SetPriority(int nPriority);
 
-		void Load();
+		static TTaskPtr Load(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler);
 		void Store(bool bForce);
 
 		void BeginProcessing();
@@ -85,10 +88,11 @@
 		void RestoreFeedbackDefaults();
 
 	private:
+		void Load(const TTaskBaseData& rBaseData);
+
 		void SetTaskDefinition(const TTaskDefinition& rTaskDefinition);
 
 		void SetLogPath(const TSmartPath& pathLog);
-		log_file& GetLog();
 
 		// methods are called when task is being added or removed from the global task array
 		/// Method is called when this task is being added to a TTaskManager object
@@ -162,7 +166,10 @@
 		bool m_bContinue;					// allows task to continue
 
 		// other helpers
-		log_file m_log;				///< Log file where task information will be stored
+#pragma warning(push)
+#pragma warning(disable: 4251)
+		TLogger m_log;				///< Log file where task information will be stored
+#pragma warning(pop)
 
 		/// Thread controlling object
 		TWorkerThreadController m_workerThread;
@@ -181,8 +188,6 @@
 
 		friend class TTaskManager;
 	};
-
-	typedef std::shared_ptr<TTask> TTaskPtr;
 }
 
 #endif