Index: src/libchcore/TTask.h
===================================================================
diff -u -N -rba802caea92ee56a154d1da3fe89a4b2f7875f0e -rbebda797ec6983535a8940f8f9f15453fe6b1785
--- src/libchcore/TTask.h	(.../TTask.h)	(revision ba802caea92ee56a154d1da3fe89a4b2f7875f0e)
+++ src/libchcore/TTask.h	(.../TTask.h)	(revision bebda797ec6983535a8940f8f9f15453fe6b1785)
@@ -27,10 +27,11 @@
 #include "TBasePathData.h"
 #include "TSubTaskBase.h"
 #include "TTaskLocalStats.h"
-#include "TBasicProgressInfo.h"
 #include "..\libicpf\log.h"
 #include "TLocalFilesystem.h"
 #include "TFileInfoArray.h"
+#include "TSubTaskArray.h"
+#include "TSubTaskContext.h"
 
 BEGIN_CHCORE_NAMESPACE
 
@@ -179,11 +180,6 @@
 	void SetStatusNL(UINT nStatus, UINT nMask);
 	UINT GetStatusNL(UINT nMask = 0xffffffff);
 
-	void CalculateProcessedSize();
-	void CalculateProcessedSizeNL();
-
-	void CalculateTotalSizeNL();
-
 	void DeleteProgress();
 
 	void SetForceFlagNL(bool bFlag = true);
@@ -207,6 +203,9 @@
 	// task initial information (needed to start a task); might be a bit processed.
 	TTaskDefinition m_tTaskDefinition;
 
+	TSubTasksArray m_tSubTasksArray;
+	TSubTaskContext m_tSubTaskContext;
+
 	TTaskConfigTracker m_cfgTracker;
 
 	TBasePathDataContainer m_arrSourcePathsInfo;
@@ -218,8 +217,6 @@
 	// changing fast
 	volatile ETaskCurrentState m_eCurrentState;     // current state of processing this task represents
 
-	TTaskBasicProgressInfo m_tTaskBasicProgressInfo;	// task progress information
-
 	// task control variables (per-session state)
 	TTaskLocalStats m_localStats;       // local statistics