Index: src/ch/TTaskManagerWrapper.cpp
===================================================================
diff -u -rd18db617f4727a237c94b59af9b4328f829eda16 -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e
--- src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
+++ src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e)
@@ -19,28 +19,26 @@
 #include "stdafx.h"
 #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 "../libictranslate/ResourceManager.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();
@@ -65,12 +63,12 @@
 
 	fmt.SetFormat(rResourceManager.LoadString(IDS_TASK_CREATE_FAILED));
 	fmt.SetParam(_T("%reason"), strMessage);
-	AfxMessageBox(fmt, MB_OK | MB_ICONERROR);
+	AfxMessageBox(fmt.ToString(), MB_OK | MB_ICONERROR);
 
 	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);
 }