Index: src/ch/TSubTaskScanDirectory.cpp
===================================================================
diff -u -N -rd345f15636dc88c4c40fe310ac7777bd024e12d9 -rd12e49decb8a3df3e28f6786d38542390484ac07
--- src/ch/TSubTaskScanDirectory.cpp	(.../TSubTaskScanDirectory.cpp)	(revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
+++ src/ch/TSubTaskScanDirectory.cpp	(.../TSubTaskScanDirectory.cpp)	(revision d12e49decb8a3df3e28f6786d38542390484ac07)
@@ -45,7 +45,7 @@
 {
 	// log
 	icpf::log_file& rLog = GetContext().GetLog();
-	CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
+	chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
 	chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
 	chcore::IFeedbackHandler* piFeedbackHandler = GetContext().GetFeedbackHandler();
 	const chcore::TBasePathDataContainer& rarrSourcePathsInfo = GetContext().GetBasePathDataContainer();
@@ -62,7 +62,7 @@
 	rFilesCache.Clear();
 
 	// read filtering options
-	CFiltersArray afFilters;
+	chcore::CFiltersArray afFilters;
 	GetTaskPropValue<eTO_Filters>(rTaskDefinition.GetConfiguration(), afFilters);
 
 	// enter some data to rFilesCache
@@ -80,11 +80,11 @@
 	size_t stSize = rTaskDefinition.GetSourcePathCount();
 	for(size_t stIndex = 0; stIndex < stSize ; stIndex++)
 	{
-		CFileInfoPtr spFileInfo;
+      chcore::CFileInfoPtr spFileInfo;
 
 		bSkipInputPath = false;
 
-		spFileInfo.reset(new CFileInfo());
+		spFileInfo.reset(new chcore::CFileInfo());
 
 		// try to get some info about the input path; let user know if the path does not exist.
 		do
@@ -218,14 +218,14 @@
 	return eSubResult_Continue;
 }
 
-int TSubTaskScanDirectories::ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, CFiltersArray& afFilters)
+int TSubTaskScanDirectories::ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, chcore::CFiltersArray& afFilters)
 {
-	CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
+   chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
 	chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
 	chcore::TWorkerThreadController& rThreadController = GetContext().GetThreadController();
 
 	TLocalFilesystemFind finder = TLocalFilesystem::CreateFinderObject(pathDirName, chcore::PathFromString(_T("*")));
-	CFileInfoPtr spFileInfo(boost::make_shared<CFileInfo>());
+   chcore::CFileInfoPtr spFileInfo(boost::make_shared<chcore::CFileInfo>());
 
 	while(finder.FindNext(spFileInfo))
 	{
@@ -238,7 +238,7 @@
 			{
 				spFileInfo->SetParentObject(stSrcIndex, &rTaskDefinition.GetSourcePaths());
 				rFilesCache.AddFileInfo(spFileInfo);
-				spFileInfo = boost::make_shared<CFileInfo>();
+            spFileInfo = boost::make_shared<chcore::CFileInfo>();
 			}
 		}
 		else
@@ -248,7 +248,7 @@
 			{
 				spFileInfo->SetParentObject(stSrcIndex, &rTaskDefinition.GetSourcePaths());
 				rFilesCache.AddFileInfo(spFileInfo);
-				spFileInfo = boost::make_shared<CFileInfo>();
+            spFileInfo = boost::make_shared<chcore::CFileInfo>();
 			}
 
 			if(bRecurse)