Index: src/libchcore/TFeedbackHandlerWrapper.cpp =================================================================== diff -u -N -r11b0a299be97bc3afaa633d6522c17b214ba3b79 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TFeedbackHandlerWrapper.cpp (.../TFeedbackHandlerWrapper.cpp) (revision 11b0a299be97bc3afaa633d6522c17b214ba3b79) +++ src/libchcore/TFeedbackHandlerWrapper.cpp (.../TFeedbackHandlerWrapper.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -20,66 +20,65 @@ #include "TFeedbackHandlerWrapper.h" #include "TScopedRunningTimeTrackerPause.h" -BEGIN_CHCORE_NAMESPACE - -TFeedbackHandlerWrapper::TFeedbackHandlerWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, TScopedRunningTimeTracker& rTimeGuard) : - m_spFeedbackHandler(spFeedbackHandler), - m_rTimeGuard(rTimeGuard) +namespace chcore { -} + TFeedbackHandlerWrapper::TFeedbackHandlerWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, TScopedRunningTimeTracker& rTimeGuard) : + m_spFeedbackHandler(spFeedbackHandler), + m_rTimeGuard(rTimeGuard) + { + } -TFeedbackHandlerWrapper::~TFeedbackHandlerWrapper() -{ -} + TFeedbackHandlerWrapper::~TFeedbackHandlerWrapper() + { + } -EFeedbackResult TFeedbackHandlerWrapper::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) -{ - TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + EFeedbackResult TFeedbackHandlerWrapper::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) + { + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->FileError(strSrcPath, strDstPath, eFileError, ulError); -} + return m_spFeedbackHandler->FileError(strSrcPath, strDstPath, eFileError, ulError); + } -EFeedbackResult TFeedbackHandlerWrapper::FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo) -{ - TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + EFeedbackResult TFeedbackHandlerWrapper::FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo) + { + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->FileAlreadyExists(spSrcFileInfo, spDstFileInfo); -} + return m_spFeedbackHandler->FileAlreadyExists(spSrcFileInfo, spDstFileInfo); + } -EFeedbackResult TFeedbackHandlerWrapper::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) -{ - TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + EFeedbackResult TFeedbackHandlerWrapper::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) + { + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->NotEnoughSpace(strSrcPath, strDstPath, ullRequiredSize); -} + return m_spFeedbackHandler->NotEnoughSpace(strSrcPath, strDstPath, ullRequiredSize); + } -EFeedbackResult TFeedbackHandlerWrapper::OperationFinished() -{ - TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + EFeedbackResult TFeedbackHandlerWrapper::OperationFinished() + { + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->OperationFinished(); -} + return m_spFeedbackHandler->OperationFinished(); + } -EFeedbackResult TFeedbackHandlerWrapper::OperationError() -{ - TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); + EFeedbackResult TFeedbackHandlerWrapper::OperationError() + { + TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard); - return m_spFeedbackHandler->OperationError(); -} + return m_spFeedbackHandler->OperationError(); + } -void TFeedbackHandlerWrapper::RestoreDefaults() -{ - return m_spFeedbackHandler->RestoreDefaults(); -} + void TFeedbackHandlerWrapper::RestoreDefaults() + { + return m_spFeedbackHandler->RestoreDefaults(); + } -void TFeedbackHandlerWrapper::Store(const ISerializerContainerPtr& spContainer) const -{ - return m_spFeedbackHandler->Store(spContainer); -} + void TFeedbackHandlerWrapper::Store(const ISerializerContainerPtr& spContainer) const + { + return m_spFeedbackHandler->Store(spContainer); + } -void TFeedbackHandlerWrapper::Load(const ISerializerContainerPtr& spContainer) -{ - return m_spFeedbackHandler->Load(spContainer); + void TFeedbackHandlerWrapper::Load(const ISerializerContainerPtr& spContainer) + { + return m_spFeedbackHandler->Load(spContainer); + } } - -END_CHCORE_NAMESPACE