Index: src/ch/TTaskManagerWrapper.cpp
===================================================================
diff -u -N -rb26ced3298e3e7e51d91f3ac70b56746786da83b -r0d5b67ee96b435d63f7bf075dc8e28603793b187
--- src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision b26ced3298e3e7e51d91f3ac70b56746786da83b)
+++ src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
@@ -20,27 +20,25 @@
 #include "TTaskManagerWrapper.h"
 #include "resource.h"
 #include "../libictranslate/ResourceManager.h"
-#include "../libchcore/TTaskConfiguration.h"
-#include "../libchcore/TTaskDefinition.h"
-#include "../libchcore/TTask.h"
 #include "../libchcore/TBaseException.h"
 #include "CfgProperties.h"
 #include "ch.h"
+#include "../libchengine/TConfigSerializers.h"
 
-TTaskManagerWrapper::TTaskManagerWrapper(const chcore::TTaskManagerPtr& spTaskManager) :
+TTaskManagerWrapper::TTaskManagerWrapper(const chengine::TTaskManagerPtr& spTaskManager) :
 	m_spTaskManager(spTaskManager)
 {
 }
 
-chcore::TTaskPtr TTaskManagerWrapper::CreateTask(chcore::TTaskDefinition& rTaskDefinition)
+chengine::TTaskPtr TTaskManagerWrapper::CreateTask(chengine::TTaskDefinition& rTaskDefinition)
 {
 	UpdateFileNamingFormat(rTaskDefinition.GetConfiguration());
 
 	CString strMessage;
 	try
 	{
 		// create task with the above definition
-		chcore::TTaskPtr spTask = m_spTaskManager->CreateTask(rTaskDefinition);
+		chengine::TTaskPtr spTask = m_spTaskManager->CreateTask(rTaskDefinition);
 
 		// add to task list and start processing
 		spTask->BeginProcessing();
@@ -70,7 +68,7 @@
 	return nullptr;
 }
 
-void TTaskManagerWrapper::UpdateFileNamingFormat(chcore::TConfig& rTaskConfig)
+void TTaskManagerWrapper::UpdateFileNamingFormat(chengine::TConfig& rTaskConfig)
 {
 	ictranslate::CResourceManager& rResourceManager = ictranslate::CResourceManager::Acquire();
 
@@ -89,6 +87,6 @@
 	}
 
 	// load resource strings
-	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_First>(rTaskConfig, (PCTSTR)strFirstCopyFormat);
-	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_AfterFirst>(rTaskConfig, (PCTSTR)strSubsequentCopyFormat);
+	chengine::SetTaskPropValue<chengine::eTO_AlternateFilenameFormatString_First>(rTaskConfig, (PCTSTR)strFirstCopyFormat);
+	chengine::SetTaskPropValue<chengine::eTO_AlternateFilenameFormatString_AfterFirst>(rTaskConfig, (PCTSTR)strSubsequentCopyFormat);
 }