diff options
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) |