Index: src/libchcore/TFeedbackHandlerBase.cpp =================================================================== diff -u -N -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4d1f8110906889d56552771fb58a6de86bc54a29 --- src/libchcore/TFeedbackHandlerBase.cpp (.../TFeedbackHandlerBase.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) +++ src/libchcore/TFeedbackHandlerBase.cpp (.../TFeedbackHandlerBase.cpp) (revision 4d1f8110906889d56552771fb58a6de86bc54a29) @@ -115,29 +115,30 @@ m_eOperationFinished = EFeedbackResult::eResult_Unknown; m_eOperationError = EFeedbackResult::eResult_Unknown; } +/* - EFeedbackResult TFeedbackHandlerBase::FileError(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, EFileError /*eFileError*/, unsigned long /*ulError*/) + TFeedbackResult TFeedbackHandlerBase::FileError(const TString& / *strSrcPath* /, const TString& / *strDstPath* /, EFileError / *eFileError* /, unsigned long / *ulError* /) { - return m_eFileError; + return TFeedbackResult(m_eFileError, HasFileErrorPermanentResponse()); } - EFeedbackResult TFeedbackHandlerBase::FileAlreadyExists(const TFileInfoPtr& /*spSrcFileInfo*/, const TFileInfoPtr& /*spDstFileInfo*/) + TFeedbackResult TFeedbackHandlerBase::FileAlreadyExists(const TFileInfo& / *rSrcFileInfo* /, const TFileInfo& / *rDstFileInfo* /) { return m_eFileAlreadyExists; } - EFeedbackResult TFeedbackHandlerBase::NotEnoughSpace(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, unsigned long long /*ullRequiredSize*/) + TFeedbackResult TFeedbackHandlerBase::NotEnoughSpace(const TString& / *strSrcPath* /, const TString& / *strDstPath* /, unsigned long long / *ullRequiredSize* /) { return m_eNotEnoughSpace; } - EFeedbackResult TFeedbackHandlerBase::OperationFinished() + TFeedbackResult TFeedbackHandlerBase::OperationFinished() { return m_eOperationFinished; } - EFeedbackResult TFeedbackHandlerBase::OperationError() + TFeedbackResult TFeedbackHandlerBase::OperationError() { return m_eOperationError; - } + }*/ }