Index: src/ch/task.cpp =================================================================== diff -u -r4d20d0e58f37f06ac91287015b960308db54d47e -r249b191b71fb9dde75cf47ff3a04eddbab822698 --- src/ch/task.cpp (.../task.cpp) (revision 4d20d0e58f37f06ac91287015b960308db54d47e) +++ src/ch/task.cpp (.../task.cpp) (revision 249b191b71fb9dde75cf47ff3a04eddbab822698) @@ -352,7 +352,7 @@ if(m_tTaskDefinition.GetSourcePathCount() > 0) pData->m_strPath = m_tTaskDefinition.GetSourcePathAt(0).GetFileName().ToString(); else - pData->m_strPath.Empty(); + pData->m_strPath.Clear(); } } @@ -388,8 +388,8 @@ } else { - pData->m_strFullFilePath.Empty(); - pData->m_strFileName.Empty(); + pData->m_strFullFilePath.Clear(); + pData->m_strFileName.Clear(); } } } Index: src/ch/task.h =================================================================== diff -u -r4d20d0e58f37f06ac91287015b960308db54d47e -r249b191b71fb9dde75cf47ff3a04eddbab822698 --- src/ch/task.h (.../task.h) (revision 4d20d0e58f37f06ac91287015b960308db54d47e) +++ src/ch/task.h (.../task.h) (revision 249b191b71fb9dde75cf47ff3a04eddbab822698) @@ -55,8 +55,8 @@ // structure for getting status of a task struct TASK_DISPLAY_DATA { - CString m_strFullFilePath; - CString m_strFileName; + chcore::TString m_strFullFilePath; + chcore::TString m_strFileName; int m_iCurrentBufferSize; int m_iCurrentBufferIndex; @@ -78,15 +78,15 @@ time_t m_timeElapsed; - CString m_strUniqueName; // doesn't change from first setting + chcore::TString m_strUniqueName; // doesn't change from first setting bool m_bIgnoreDirectories; bool m_bCreateEmptyFiles; }; struct TASK_MINI_DISPLAY_DATA { - CString m_strPath; + chcore::TString m_strPath; ETaskCurrentState m_eTaskState; Fisheye: Tag 249b191b71fb9dde75cf47ff3a04eddbab822698 refers to a dead (removed) revision in file `src/common/ErrorConstants.h'. Fisheye: No comparison available. Pass `N' to diff? Index: src/libchcore/FeedbackHandlerBase.h =================================================================== diff -u -r4d20d0e58f37f06ac91287015b960308db54d47e -r249b191b71fb9dde75cf47ff3a04eddbab822698 --- src/libchcore/FeedbackHandlerBase.h (.../FeedbackHandlerBase.h) (revision 4d20d0e58f37f06ac91287015b960308db54d47e) +++ src/libchcore/FeedbackHandlerBase.h (.../FeedbackHandlerBase.h) (revision 249b191b71fb9dde75cf47ff3a04eddbab822698) @@ -21,14 +21,24 @@ #include "libchcore.h" #include "../libicpf/interface.h" -#include "../common/ErrorConstants.h" BEGIN_CHCORE_NAMESPACE +enum EFileError +{ + eDeleteError, ///< Problem occured when tried to delete the fs object + eSeekError, ///< Problem occured when tried to set file pointer + eResizeError, ///< Problem occured when tried to change size of the fs object + eReadError, ///< Problem occured when tried to read data from file + eWriteError, ///< Problem occured when tried to write data to a file + eFastMoveError, ///< Problem occured when tried to perform fast move operation (that does not involve copying contents) + eCreateError ///< Problem occured when tried to create the fs object +}; + struct FEEDBACK_ALREADYEXISTS { - chcore::TFileInfoPtr spSrcFileInfo; - chcore::TFileInfoPtr spDstFileInfo; + TFileInfoPtr spSrcFileInfo; + TFileInfoPtr spDstFileInfo; }; struct FEEDBACK_FILEERROR