Index: src/ch/task.h =================================================================== diff -u -N -r4d497e3545ae7c7b9fadedcffeb6960cfd19e724 -r4cd45795025411a82006a94d9c7f7f2d9ecda421 --- src/ch/task.h (.../task.h) (revision 4d497e3545ae7c7b9fadedcffeb6960cfd19e724) +++ src/ch/task.h (.../task.h) (revision 4cd45795025411a82006a94d9c7f7f2d9ecda421) @@ -39,12 +39,6 @@ #define ST_DELETING 0x00000003 //------------------------------------ -#define ST_OPERATION_MASK 0x00000f00 -#define ST_COPY 0x00000100 -// moving - delete after copying all files -#define ST_MOVE 0x00000200 - -//------------------------------------ #define ST_SPECIAL_MASK 0x0000f000 // simultaneous flags #define ST_IGNORE_DIRS 0x00001000 @@ -65,6 +59,12 @@ eTaskState_Max }; +enum EOperationType +{ + eOperation_Copy, + eOperation_Move +}; + /////////////////////////////////////////////////////////////////////////// // Exceptions @@ -394,6 +394,9 @@ void SetTaskState(ETaskCurrentState eTaskState); ETaskCurrentState GetTaskState() const; + void SetOperationType(EOperationType eOperationType); + EOperationType GetOperationType() const; + // m_nBufferSize void SetBufferSizes(const BUFFERSIZES* bsSizes); const BUFFERSIZES* GetBufferSizes(); @@ -516,6 +519,8 @@ CClipboardArray m_clipboard; // original paths with which we started operation CDestPath m_dpDestPath; // destination path + EOperationType m_eOperation; // operation which is to be performed by this task object + // task settings int m_nPriority; // task priority (really processing thread priority) @@ -530,6 +535,7 @@ // changing fast 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