Index: src/libchcore/TSubTaskArray.h =================================================================== diff -u -N -r12a1725bfd04b0f55fd0fda302975fdcd4174943 -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 --- src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision 12a1725bfd04b0f55fd0fda302975fdcd4174943) +++ src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8) @@ -27,6 +27,7 @@ #include #include "TSubTaskBase.h" #include "TTaskLocalStats.h" +#include "TSubTaskArrayStatsSnapshot.h" BEGIN_CHCORE_NAMESPACE @@ -74,14 +75,14 @@ class LIBCHCORE_API TSubTasksArray { public: - TSubTasksArray(TTaskLocalStatsInfo& rLocalStats); - TSubTasksArray(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext, TTaskLocalStatsInfo& rLocalStats); + TSubTasksArray(); + TSubTasksArray(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext); ~TSubTasksArray(); void Init(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext); // Stats handling - void GetTaskStats(TTaskStatsSnapshot& rSnapshot) const; + void GetStatsSnapshot(TSubTaskArrayStatsSnapshot& rSnapshot) const; void ResetProgressAndStats(); // progress handling @@ -94,15 +95,14 @@ TSubTasksArray(const TSubTasksArray& rSrc); TSubTasksArray& operator=(const TSubTasksArray& rSrc); - void AddSubTask(const TSubTaskBasePtr& spOperation, int iPercent, bool bIsPartOfEstimation); + void AddSubTask(const TSubTaskBasePtr& spOperation, bool bIsPartOfEstimation); private: TSubTaskContext* m_pSubTaskContext; - TTaskLocalStatsInfo& m_rLocalStats; #pragma warning(push) #pragma warning(disable: 4251) - std::vector > m_vSubTasks; // pointer to the subtask object / part of the whole process / is this the part of estimation? + std::vector > m_vSubTasks; // pointer to the subtask object / part of the whole process / is this the part of estimation? details::TTaskBasicProgressInfo m_tProgressInfo; #pragma warning(pop)