Index: src/libchengine/TDestinationPathProvider.h =================================================================== diff -u -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -re9f05a628a169c449e335bd95ea418a4451ba04c --- src/libchengine/TDestinationPathProvider.h (.../TDestinationPathProvider.h) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/libchengine/TDestinationPathProvider.h (.../TDestinationPathProvider.h) (revision e9f05a628a169c449e335bd95ea418a4451ba04c) @@ -31,11 +31,13 @@ TDestinationPathProvider(const IFilesystemPtr& spFilesystem, const chcore::TSmartPath& pathDestinationBase, bool bIgnoreFolders, bool bForceDirectories, const string::TString& strFirstAltName, const string::TString& strNextAltName); - chcore::TSmartPath CalculateDestinationPath(const TFileInfoPtr& spFileInfo); + chcore::TSmartPath CalculateDestinationPath(const TFileInfoPtr& spFileInfo) const; + chcore::TSmartPath CalculateSuggestedDestinationPath(chcore::TSmartPath pathDstPath) const; private: - chcore::TSmartPath CalculateForceDirectories(const TFileInfoPtr& spFileInfo); - chcore::TSmartPath CalculateIgnoreDirectories(const TFileInfoPtr& spFileInfo); + chcore::TSmartPath CalculateForceDirectories(const TFileInfoPtr& spFileInfo) const; + chcore::TSmartPath CalculateIgnoreDirectories(const TFileInfoPtr& spFileInfo) const; + chcore::TSmartPath CalculateNormalDestination(const TFileInfoPtr& spFileInfo) const; chcore::TSmartPath FindFreeSubstituteName(chcore::TSmartPath pathSrcPath) const; private: