Index: src/libchengine/TTask.h =================================================================== diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r08717141ce5f6926116c298cbc9442094a45bb67 --- src/libchengine/TTask.h (.../TTask.h) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/libchengine/TTask.h (.../TTask.h) (revision 08717141ce5f6926116c298cbc9442094a45bb67) @@ -19,7 +19,6 @@ #ifndef __TASK_H__ #define __TASK_H__ -#include "IFeedbackHandler.h" #include "TTaskDefinition.h" #include "TTaskConfigTracker.h" #include "TBasePathData.h" @@ -33,6 +32,7 @@ #include "IFilesystem.h" #include "../liblogger/TLogger.h" #include "../libchcore/TWorkerThreadController.h" +#include "FeedbackManager.h" namespace chengine { @@ -136,7 +136,8 @@ #pragma warning(disable: 4251) serializer::ISerializerPtr m_spSerializer; std::mutex m_mutexSerializer; - IFeedbackHandlerPtr m_spInternalFeedbackHandler; + + FeedbackManagerPtr m_spFeedbackManager; #pragma warning(pop) // base data @@ -151,10 +152,9 @@ // Global task settings TConfig m_tConfiguration; + TSubTaskContext m_tSubTaskContext; TSubTasksArray m_tSubTasksArray; - TSubTaskContext m_tSubTaskContext; - TTaskConfigTracker m_cfgTracker; // current task state (derivatives of the task initial information)