Index: src/libchcore/TSubTaskContext.h =================================================================== diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -rd18db617f4727a237c94b59af9b4328f829eda16 --- src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01) +++ src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision d18db617f4727a237c94b59af9b4328f829eda16) @@ -26,7 +26,6 @@ #include "libchcore.h" #include "TPath.h" #include "EOperationTypes.h" -#include "IFeedbackHandler.h" #include "TBasePathData.h" #include "TFileInfoArray.h" #include "IFilesystem.h" @@ -47,7 +46,7 @@ public: TSubTaskContext(TConfig& rConfig, const TBasePathDataContainerPtr& spBasePaths, const TFileFiltersArray& rFilters, - TTaskConfigTracker& rCfgTracker, chcore::log_file& rLog, + TTaskConfigTracker& rCfgTracker, log_file& rLog, TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem); ~TSubTaskContext(); @@ -69,14 +68,13 @@ TTaskConfigTracker& GetCfgTracker(); const TTaskConfigTracker& GetCfgTracker() const; - chcore::log_file& GetLog(); - const chcore::log_file& GetLog() const; + log_file& GetLog(); + const log_file& GetLog() const; TWorkerThreadController& GetThreadController(); const TWorkerThreadController& GetThreadController() const; - IFilesystemPtr GetLocalFilesystem(); - const IFilesystemPtr GetLocalFilesystem() const; + IFilesystemPtr GetLocalFilesystem() const; private: TSubTaskContext(const TSubTaskContext& rSrc); @@ -110,7 +108,7 @@ #pragma warning(pop) // additional data - chcore::log_file& m_rLog; + log_file& m_rLog; // thread control TWorkerThreadController& m_rThreadController;