Index: src/ch/task.h =================================================================== diff -u -N -r61ed5f2f3084ba759ec27f61b4f909ed8ce305e9 -r4d497e3545ae7c7b9fadedcffeb6960cfd19e724 --- src/ch/task.h (.../task.h) (revision 61ed5f2f3084ba759ec27f61b4f909ed8ce305e9) +++ src/ch/task.h (.../task.h) (revision 4d497e3545ae7c7b9fadedcffeb6960cfd19e724) @@ -53,16 +53,16 @@ enum ETaskCurrentState { - eTaskState_None, - eTaskState_Waiting, - eTaskState_Processing, - eTaskState_Paused, - eTaskState_Cancelled, - eTaskState_Error, - eTaskState_Finished, + eTaskState_None, + eTaskState_Waiting, + eTaskState_Processing, + eTaskState_Paused, + eTaskState_Cancelled, + eTaskState_Error, + eTaskState_Finished, - // insert new values before this one - eTaskState_Max + // insert new values before this one + eTaskState_Max }; /////////////////////////////////////////////////////////////////////////// @@ -89,17 +89,16 @@ CDestPath* m_pdpDestPath; CFiltersArray* m_pafFilters; - UINT m_uiStatus; - ETaskCurrentState m_eTaskState; + ETaskCurrentState m_eTaskState; const BUFFERSIZES* m_pbsSizes; - int m_nPriority; + int m_nPriority; - ull_t m_ullProcessedSize; - ull_t m_ullSizeAll; - int m_nPercent; + ull_t m_ullProcessedSize; + ull_t m_ullSizeAll; + int m_nPercent; - time_t m_timeElapsed; + time_t m_timeElapsed; const CString* m_pstrUniqueName; // doesn't change from first setting @@ -110,8 +109,7 @@ { CString m_strPath; - UINT m_uiStatus; - ETaskCurrentState m_eTaskState; + ETaskCurrentState m_eTaskState; int m_nPercent; }; @@ -393,8 +391,8 @@ void SetStatus(UINT nStatus, UINT nMask); UINT GetStatus(UINT nMask = 0xffffffff); - void SetTaskState(ETaskCurrentState eTaskState); - ETaskCurrentState GetTaskState() const; + void SetTaskState(ETaskCurrentState eTaskState); + ETaskCurrentState GetTaskState() const; // m_nBufferSize void SetBufferSizes(const BUFFERSIZES* bsSizes); @@ -531,7 +529,7 @@ CFileInfoArray m_files; // list of files/directories found during operating on the task input data (filled by search for files) // changing fast - volatile ETaskCurrentState m_eCurrentState; // current state of processing this task represents + volatile ETaskCurrentState m_eCurrentState; // current state of processing this task represents volatile UINT m_nStatus; // what phase of the operation is this task in TTaskProgressInfo m_tTaskProgressInfo; // task progress information