Index: src/libchcore/TTask.h =================================================================== diff -u -N -rb26ced3298e3e7e51d91f3ac70b56746786da83b -re98c03b108baad889dfd7c7fbb1a49f5ea5a55d8 --- src/libchcore/TTask.h (.../TTask.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) +++ src/libchcore/TTask.h (.../TTask.h) (revision e98c03b108baad889dfd7c7fbb1a49f5ea5a55d8) @@ -48,8 +48,8 @@ { private: TTask(const TTask&) = delete; - TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskBaseData& rBaseTaskData, const logger::TMultiLoggerConfigPtr& spLoggerConfig); - TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskDefinition& rTaskDefinition, const TSmartPath& rLogPath, const logger::TMultiLoggerConfigPtr& spLoggerConfig); + TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const logger::TLogFileDataPtr& spLogFileData); + TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskDefinition& rTaskDefinition, const logger::TLogFileDataPtr& spLogFileData); TTask& operator=(const TTask&) = delete; @@ -72,7 +72,7 @@ // thread void SetPriority(int nPriority); - static TTaskPtr Load(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const logger::TMultiLoggerConfigPtr& spLoggerConfig); + static TTaskPtr Load(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const logger::TLogFileDataPtr& spLogFileData); void Store(bool bForce); void BeginProcessing(); @@ -91,12 +91,10 @@ void RestoreFeedbackDefaults(); private: - void Load(const TTaskBaseData& rBaseData); + void Load(); void SetTaskDefinition(const TTaskDefinition& rTaskDefinition); - void SetLogPath(const TSmartPath& pathLog); - // methods are called when task is being added or removed from the global task array /// Method is called when this task is being added to a TTaskManager object void OnRegisterTask();