Index: src/libchengine/IFeedbackHandler.h =================================================================== diff -u -N -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16 -rf01ed9a0279a52c96a7272273ef19e57f7670f4a --- src/libchengine/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16) +++ src/libchengine/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision f01ed9a0279a52c96a7272273ef19e57f7670f4a) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2001-2008 by J�zef Starosczyk * + * Copyright (C) 2001-2020 by J�zef Starosczyk * * ixen@copyhandler.com * * * * This program is free software; you can redistribute it and/or modify * @@ -16,18 +16,16 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef __FEEDBACKHANDLERBASE_H__ -#define __FEEDBACKHANDLERBASE_H__ +#pragma once #include "EFileError.h" #include "TFeedbackResult.h" #include "../libstring/TString.h" -#include "../libserializer/ISerializerContainer.h" #include "EOperationEvent.h" #include "FeedbackErrorRuleList.h" -#include "FeedbackAlreadyExistsRuleList.h" #include "FeedbackNotEnoughSpaceRuleList.h" #include "FeedbackOperationEventRuleList.h" +#include "FeedbackRules.h" namespace chengine { @@ -39,12 +37,10 @@ virtual ~IFeedbackHandler(); virtual EFeedbackResult FileError(const string::TString& strSrcPath, const string::TString& strDstPath, EFileError eFileError, unsigned long ulError, FeedbackErrorRuleList& rNewRules) = 0; - virtual EFeedbackResult FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, string::TString& strRenameName, FeedbackAlreadyExistsRuleList& rNewRules) = 0; + virtual EFeedbackResult FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, string::TString& strRenameName, FeedbackRules& rNewRules) = 0; virtual EFeedbackResult NotEnoughSpace(const string::TString& strSrcPath, const string::TString& strDstPath, unsigned long long ullRequiredSize, FeedbackNotEnoughSpaceRuleList& rNewRules) = 0; virtual EFeedbackResult OperationEvent(EOperationEvent eEvent, FeedbackOperationEventRuleList& rNewRules) = 0; }; typedef std::shared_ptr IFeedbackHandlerPtr; } - -#endif