Index: src/ch/TSubTaskCopyMove.cpp
===================================================================
diff -u -N -r886c32a98f09ae8dc24ceb6b27e5c8a75104954e -r6dc950d4d76107421ff6eb62069b70f20bcc450e
--- src/ch/TSubTaskCopyMove.cpp	(.../TSubTaskCopyMove.cpp)	(revision 886c32a98f09ae8dc24ceb6b27e5c8a75104954e)
+++ src/ch/TSubTaskCopyMove.cpp	(.../TSubTaskCopyMove.cpp)	(revision 6dc950d4d76107421ff6eb62069b70f20bcc450e)
@@ -24,7 +24,7 @@
 #include "TSubTaskCopyMove.h"
 #include "TSubTaskContext.h"
 #include "TTaskConfiguration.h"
-#include "TTaskDefinition.h"
+#include "../libchcore/TTaskDefinition.h"
 #include "task.h"
 #include "TLocalFilesystem.h"
 #include "FeedbackHandler.h"
@@ -53,7 +53,7 @@
 {
 	icpf::log_file& rLog = GetContext().GetLog();
 	CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
-	TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
+	chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
 	TTaskConfigTracker& rCfgTracker = GetContext().GetCfgTracker();
 	TTaskBasicProgressInfo& rBasicProgressInfo = GetContext().GetTaskBasicProgressInfo();
 	TWorkerThreadController& rThreadController = GetContext().GetThreadController();
@@ -132,7 +132,7 @@
 
 		// are the files/folders lie on the same partition ?
 		int iDstDriveNumber = 0;
-		bool bMove = rTaskDefinition.GetOperationType() == eOperation_Move;
+		bool bMove = rTaskDefinition.GetOperationType() == chcore::eOperation_Move;
 		if(bMove)
 			TLocalFilesystem::GetDriveData(rTaskDefinition.GetDestinationPath(), &iDstDriveNumber, NULL);
 		if(bMove && iDstDriveNumber != -1 && iDstDriveNumber == GetDriveNumber(spFileInfo) && GetMove(spFileInfo))
@@ -277,7 +277,7 @@
 int TSubTaskCopyMove::GetBufferIndex(const CFileInfoPtr& spFileInfo)
 {
 	TBasePathDataContainer& rSrcPathsInfo = GetContext().GetBasePathDataContainer();
-	TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
+	chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
 
 	if(!spFileInfo)
 		THROW(_T("Invalid pointer"), 0, 0, 0);
@@ -325,7 +325,7 @@
 
 TSubTaskBase::ESubOperationResult TSubTaskCopyMove::CustomCopyFileFB(CUSTOM_COPY_PARAMS* pData)
 {
-	TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
+	chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
 	TTaskBasicProgressInfo& rBasicProgressInfo = GetContext().GetTaskBasicProgressInfo();
 	TWorkerThreadController& rThreadController = GetContext().GetThreadController();
 	TTaskLocalStats& rLocalStats = GetContext().GetTaskLocalStats();