diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:25 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:25 +0200 |
| commit | 94e1d2e78b6ff92d5a1c971c277cb6ac792d1c70 (patch) | |
| tree | 338d2ab72f79901f5d32c96d63cec36f30bcf44e /file_hierarchy.h | |
| parent | 4.4 (diff) | |
| download | FreeFileSync-94e1d2e78b6ff92d5a1c971c277cb6ac792d1c70.tar.gz FreeFileSync-94e1d2e78b6ff92d5a1c971c277cb6ac792d1c70.tar.bz2 FreeFileSync-94e1d2e78b6ff92d5a1c971c277cb6ac792d1c70.zip | |
4.5
Diffstat (limited to 'file_hierarchy.h')
| -rw-r--r-- | file_hierarchy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/file_hierarchy.h b/file_hierarchy.h index ac7ed87d..c0db4be9 100644 --- a/file_hierarchy.h +++ b/file_hierarchy.h @@ -348,7 +348,7 @@ public: virtual CompareFilesResult getCategory() const = 0; virtual std::wstring getCatConflict() const = 0; //only filled if getCategory() == FILE_CONFLICT //sync operation - virtual SyncOperation testSyncOperation(SyncDirection testSyncDir, bool enabled) const; + virtual SyncOperation testSyncOperation(SyncDirection testSyncDir, bool active) const; virtual SyncOperation getSyncOperation() const; std::wstring getSyncOpConflict() const; //return conflict when determining sync direction or during categorization @@ -491,7 +491,7 @@ public: virtual CompareFilesResult getCategory() const; virtual std::wstring getCatConflict() const; - virtual SyncOperation testSyncOperation(SyncDirection testSyncDir, bool enabled) const; + virtual SyncOperation testSyncOperation(SyncDirection testSyncDir, bool active) const; virtual SyncOperation getSyncOperation() const; template <SelectedSide side> void syncTo(const FileDescriptor& descrTarget, const FileDescriptor* descrSource = NULL); //copy + update file attributes (optional) |