Index: src/ch/TSubTaskContext.h =================================================================== diff -u -N -r6e8aa26e2428e3bc71099255c5911f57bc722100 -r6dc950d4d76107421ff6eb62069b70f20bcc450e --- src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision 6e8aa26e2428e3bc71099255c5911f57bc722100) +++ src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision 6dc950d4d76107421ff6eb62069b70f20bcc450e) @@ -25,8 +25,12 @@ #include "FileInfo.h" -class TTaskDefinition; -namespace chcore { class IFeedbackHandler; } +namespace chcore +{ + class IFeedbackHandler; + class TTaskDefinition; +} + class TWorkerThreadController; class TBasePathDataContainer; class TTaskLocalStats; @@ -39,13 +43,13 @@ class TSubTaskContext { public: - TSubTaskContext(TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, + TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, chcore::IFeedbackHandler* piFeedbackHandler, TWorkerThreadController& rThreadController); ~TSubTaskContext(); - TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; } - const TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; } + chcore::TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; } + const chcore::TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; } TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; } const TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; } @@ -72,7 +76,7 @@ const TWorkerThreadController& GetThreadController() const { return m_rThreadController; } private: - TTaskDefinition& m_rTaskDefinition; + chcore::TTaskDefinition& m_rTaskDefinition; // information about input paths TBasePathDataContainer& m_rBasePathDataContainer;