Index: src/ch/TSubTaskContext.h =================================================================== diff -u -N -rd345f15636dc88c4c40fe310ac7777bd024e12d9 -rd12e49decb8a3df3e28f6786d38542390484ac07 --- src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9) +++ src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) @@ -23,7 +23,7 @@ #ifndef __TSUBTASKCONTEXT_H__ #define __TSUBTASKCONTEXT_H__ -#include "FileInfo.h" +#include "../libchcore/FileInfo.h" namespace chcore { @@ -44,7 +44,7 @@ class TSubTaskContext { public: - TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, + TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, chcore::CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal); ~TSubTaskContext(); @@ -55,8 +55,8 @@ chcore::TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; } const chcore::TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; } - CFileInfoArray& GetFilesCache() { return m_rFilesCache; } - const CFileInfoArray& GetFilesCache() const { return m_rFilesCache; } + chcore::CFileInfoArray& GetFilesCache() { return m_rFilesCache; } + const chcore::CFileInfoArray& GetFilesCache() const { return m_rFilesCache; } TTaskLocalStats& GetTaskLocalStats() { return m_rTaskLocalStats; } const TTaskLocalStats& GetTaskLocalStats() const { return m_rTaskLocalStats; } @@ -86,7 +86,7 @@ chcore::TBasePathDataContainer& m_rBasePathDataContainer; // data on which to operate - CFileInfoArray& m_rFilesCache; + chcore::CFileInfoArray& m_rFilesCache; // local stats for task TTaskLocalStats& m_rTaskLocalStats;