diff options
| author | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
| commit | e5633fb1c0db91f01ab967330b76baf4ecdb0512 (patch) | |
| tree | 10260e25ae905564f7978b83fc4e316670f987c6 /FreeFileSync/Source/base/algorithm.h | |
| parent | Merge branch '10.25' into 'master' (diff) | |
| parent | add upstream 11.0 (diff) | |
| download | FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.gz FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.bz2 FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.zip | |
Merge branch '11.0' into 'master'11.0
add upstream 11.0
See merge request opensource-tracking/FreeFileSync!24
Diffstat (limited to 'FreeFileSync/Source/base/algorithm.h')
| -rw-r--r-- | FreeFileSync/Source/base/algorithm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h index 8be25f7e..938ac955 100644 --- a/FreeFileSync/Source/base/algorithm.h +++ b/FreeFileSync/Source/base/algorithm.h @@ -25,9 +25,9 @@ void recursiveObjectVisitor(FileSystemObject& fsObj, void swapGrids(const MainConfiguration& mainCfg, FolderComparison& folderCmp, PhaseCallback& callback /*throw X*/); //throw X -std::vector<std::pair<BaseFolderPair*, DirectionConfig>> extractDirectionCfg(FolderComparison& folderCmp, const MainConfiguration& mainCfg); +std::vector<std::pair<BaseFolderPair*, SyncDirectionConfig>> extractDirectionCfg(FolderComparison& folderCmp, const MainConfiguration& mainCfg); -void redetermineSyncDirection(const std::vector<std::pair<BaseFolderPair*, DirectionConfig>>& directCfgs, +void redetermineSyncDirection(const std::vector<std::pair<BaseFolderPair*, SyncDirectionConfig>>& directCfgs, PhaseCallback& callback /*throw X*/); //throw X void setSyncDirectionRec(SyncDirection newDirection, FileSystemObject& fsObj); //set new direction (recursively) @@ -69,7 +69,7 @@ void copyToAlternateFolder(std::span<const FileSystemObject* const> rowsToCopyOn //manual deletion of files on main grid void deleteFromGridAndHD(const std::vector<FileSystemObject*>& rowsToDeleteOnLeft, //refresh GUI grid after deletion to remove invalid rows const std::vector<FileSystemObject*>& rowsToDeleteOnRight, //all pointers need to be bound! - const std::vector<std::pair<BaseFolderPair*, DirectionConfig>>& directCfgs, //attention: rows will be physically deleted! + const std::vector<std::pair<BaseFolderPair*, SyncDirectionConfig>>& directCfgs, //attention: rows will be physically deleted! bool useRecycleBin, //global warnings: bool& warnRecyclerMissing, |