Index: src/ch/task.h
===================================================================
diff -u -N -rbd08c279240bac9e7902f8da6a9251e0252ec324 -r4ec3aef62d14193e3021e6bc3f8bcdf11770c7d5
--- src/ch/task.h	(.../task.h)	(revision bd08c279240bac9e7902f8da6a9251e0252ec324)
+++ src/ch/task.h	(.../task.h)	(revision 4ec3aef62d14193e3021e6bc3f8bcdf11770c7d5)
@@ -345,7 +345,7 @@
 
 	void PauseProcessing();		// pause
 	void ResumeProcessing();	// resume
-	bool RetryProcessing(bool bOnlyErrors=false, UINT uiInterval=0);		// retry
+	bool RetryProcessing();		// retry
 	void RestartProcessing();	// from beginning
 	void CancelProcessing();	// cancel
 
@@ -452,47 +452,45 @@
 	void RequestStopThread();
 
 private:
-	icpf::log_file m_log;
-	mutable boost::shared_mutex m_lock;	// protection for this class
+   // task initial information (needed to start a task); might be a bit processed.
+   CClipboardArray m_clipboard;        // original paths with which we started operation
+   CDestPath m_dpDestPath;             // destination path
 
-	UINT m_uiResumeInterval;	// works only if the thread is off
+   // task settings
+   int m_nPriority;                    // task priority (really processing thread priority)
 
-	// feedback
-	chcore::IFeedbackHandler* m_piFeedbackHandler;
+   CString m_strUniqueName;            // name for the task (should be something like uuid)
+   CFiltersArray m_afFilters;          // filtering settings for files (will be filtered according to the rules inside when searching for files)
 
-	// ptr to count of currently started tasks
-	bool m_bForce;		// if the continuation of tasks should be independent of limitation
-	bool m_bContinue;	// used by ClipboardMonitorProc
+   BUFFERSIZES m_bsSizes;              // sizes of buffers used to copy (derived from the global
 
-	CClipboardArray m_clipboard;
-	CFileInfoArray m_files;
+   // current task state (derivatives of the task initial information)
+   // changing slowly or only partially
+   CFileInfoArray m_files;             // list of files/directories found during operating on the task input data (filled by search for files)
 
-	volatile size_t m_stCurrentIndex;
+   // changing fast
+   volatile UINT m_nStatus;            // what phase of the operation is this task in
+   volatile size_t m_stCurrentIndex;   // index to the m_files array stating currently processed item
 
-	CDestPath m_dpDestPath;
+   // task control variables (per-session state)
+   TTaskLocalStats m_localStats;       // local statistics
 
-	volatile UINT m_nStatus;
+   bool m_bForce;		// if the continuation of tasks should be independent of limitation
+   bool m_bContinue;	// used by ClipboardMonitorProc
 
-	// buffers
-	BUFFERSIZES m_bsSizes;
+   tstring_t m_strTaskBasePath;	// base path at which the files will be stored
+   bool m_bSaved;		// has the state been saved ('til next modification)
 
-	TWorkerThreadController m_workerThread;
+   size_t m_stSessionUniqueID;
 
-	int m_nPriority;
+   // other helpers
+	icpf::log_file m_log;
+   TWorkerThreadController m_workerThread;
 
-	// other stuff
-	CString m_strUniqueName;
+   mutable boost::shared_mutex m_lock;	// protection for this class
 
-	// mask (filter)
-	CFiltersArray m_afFilters;
+   chcore::IFeedbackHandler* m_piFeedbackHandler;     // feedback
 
-	tstring_t m_strTaskBasePath;	// base path at which the files will be stored
-	bool m_bSaved;		// has the state been saved ('til next modification)
-
-	size_t m_stSessionUniqueID;
-
-	TTaskLocalStats m_localStats;
-
 	friend class CTaskArray;
 };
 
@@ -552,7 +550,7 @@
 	void TasksPauseProcessing();
 	void TasksResumeProcessing();
 	void TasksRestartProcessing();
-	bool TasksRetryProcessing(bool bOnlyErrors=false, UINT uiInterval=0);
+	bool TasksRetryProcessing();
 	void TasksCancelProcessing();
 
 	ull_t GetPosition();