Index: src/libchcore/TFeedbackHandlerWrapper.cpp =================================================================== diff -u -N -r1da7ee476d3e1e818d3af54210ba55d7063d1a2c -r671f4b1792a20d98b186f4e0a9cc6a620dede019 --- src/libchcore/TFeedbackHandlerWrapper.cpp (.../TFeedbackHandlerWrapper.cpp) (revision 1da7ee476d3e1e818d3af54210ba55d7063d1a2c) +++ src/libchcore/TFeedbackHandlerWrapper.cpp (.../TFeedbackHandlerWrapper.cpp) (revision 671f4b1792a20d98b186f4e0a9cc6a620dede019) @@ -32,16 +32,54 @@ { } -unsigned long long TFeedbackHandlerWrapper::RequestFeedback(unsigned long long ullFeedbackID, void* pFeedbackParam) +chcore::EFeedbackResult TFeedbackHandlerWrapper::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) { TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->RequestFeedback(ullFeedbackID, pFeedbackParam); + return m_spFeedbackHandler->FileError(strSrcPath, strDstPath, eFileError, ulError); } +chcore::EFeedbackResult TFeedbackHandlerWrapper::FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo) +{ + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + + return m_spFeedbackHandler->FileAlreadyExists(spSrcFileInfo, spDstFileInfo); +} + +chcore::EFeedbackResult TFeedbackHandlerWrapper::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) +{ + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + + return m_spFeedbackHandler->NotEnoughSpace(strSrcPath, strDstPath, ullRequiredSize); +} + +chcore::EFeedbackResult TFeedbackHandlerWrapper::OperationFinished() +{ + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + + return m_spFeedbackHandler->OperationFinished(); +} + +chcore::EFeedbackResult TFeedbackHandlerWrapper::OperationError() +{ + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + + return m_spFeedbackHandler->OperationError(); +} + void TFeedbackHandlerWrapper::RestoreDefaults() { return m_spFeedbackHandler->RestoreDefaults(); } +void TFeedbackHandlerWrapper::Store(const ISerializerContainerPtr& spContainer) const +{ + return m_spFeedbackHandler->Store(spContainer); +} + +void TFeedbackHandlerWrapper::Load(const ISerializerContainerPtr& spContainer) +{ + return m_spFeedbackHandler->Load(spContainer); +} + END_CHCORE_NAMESPACE