diff options
author | B Stack <bgstack15@gmail.com> | 2018-11-13 06:58:56 -0500 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2018-11-13 06:58:56 -0500 |
commit | 076498028ff511afd88d93e7b0bf1d1a81093b3d (patch) | |
tree | 30bf08d782d58174a0ca212b2e4b172fabd9c42c /FreeFileSync/Source/base/algorithm.h | |
parent | Merge branch '10.5' into 'master' (diff) | |
download | FreeFileSync-076498028ff511afd88d93e7b0bf1d1a81093b3d.tar.gz FreeFileSync-076498028ff511afd88d93e7b0bf1d1a81093b3d.tar.bz2 FreeFileSync-076498028ff511afd88d93e7b0bf1d1a81093b3d.zip |
10.6
Diffstat (limited to 'FreeFileSync/Source/base/algorithm.h')
-rwxr-xr-x | FreeFileSync/Source/base/algorithm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h index a8facb9d..f7b2cc15 100755 --- a/FreeFileSync/Source/base/algorithm.h +++ b/FreeFileSync/Source/base/algorithm.h @@ -48,16 +48,16 @@ struct PathDependency AbstractPath basePathChild; Zstring relPath; //filled if child path is subfolder of parent path; empty if child path == parent path }; -std::optional<PathDependency> getPathDependency(const AbstractPath& basePathL, const HardFilter& filterL, - const AbstractPath& basePathR, const HardFilter& filterR); +std::optional<PathDependency> getPathDependency(const AbstractPath& basePathL, const PathFilter& filterL, + const AbstractPath& basePathR, const PathFilter& filterR); std::pair<std::wstring, int> getSelectedItemsAsString( //returns string with item names and total count of selected(!) items, NOT total files/dirs! - const std::vector<const FileSystemObject*>& selectionLeft, //all pointers need to be bound! - const std::vector<const FileSystemObject*>& selectionRight); // + std::span<const FileSystemObject* const> selectionLeft, //all pointers need to be bound! + std::span<const FileSystemObject* const> selectionRight); // //manual copy to alternate folder: -void copyToAlternateFolder(const std::vector<const FileSystemObject*>& rowsToCopyOnLeft, //all pointers need to be bound! - const std::vector<const FileSystemObject*>& rowsToCopyOnRight, // +void copyToAlternateFolder(std::span<const FileSystemObject* const> rowsToCopyOnLeft, //all pointers need to be bound! + std::span<const FileSystemObject* const> rowsToCopyOnRight, // const Zstring& targetFolderPathPhrase, bool keepRelPaths, bool overwriteIfExists, |