diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
commit | ecb1524f8da7901338b263384fed3c612f117b4c (patch) | |
tree | e7e06423fe27ea5ab45f27fc4b39ae597ba72490 /structures.h | |
parent | 5.10 (diff) | |
download | FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2 FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip |
5.11
Diffstat (limited to 'structures.h')
-rw-r--r-- | structures.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/structures.h b/structures.h index 0f4695f2..91b54942 100644 --- a/structures.h +++ b/structures.h @@ -189,27 +189,26 @@ enum DeletionPolicy DELETE_TO_VERSIONING }; +enum VersioningStyle +{ + VER_STYLE_REPLACE, + VER_STYLE_ADD_TIMESTAMP, +}; struct SyncConfig { - //SyncConfig(const DirectionConfig& directCfg, - // const DeletionPolicy handleDel, - // const Zstring& versionDir) : - // directionCfg(directCfg), - // handleDeletion(handleDel), - // versioningDirectory(versionDir) {} - - SyncConfig() : //construct with default values + SyncConfig() : handleDeletion(DELETE_TO_RECYCLER), - versionCountLimit(-1) {} + versioningStyle(VER_STYLE_REPLACE) {} //sync direction settings DirectionConfig directionCfg; - //misc options DeletionPolicy handleDeletion; //use Recycle, delete permanently or move to user-defined location + //versioning options + VersioningStyle versioningStyle; Zstring versioningDirectory; - int versionCountLimit; //max versions per file (DELETE_TO_VERSIONING); < 0 := no limit + //int versionCountLimit; //max versions per file (DELETE_TO_VERSIONING); < 0 := no limit }; inline @@ -218,8 +217,8 @@ bool operator==(const SyncConfig& lhs, const SyncConfig& rhs) return lhs.directionCfg == rhs.directionCfg && lhs.handleDeletion == rhs.handleDeletion && (lhs.handleDeletion != DELETE_TO_VERSIONING || //only compare deletion directory if required! - (lhs.versioningDirectory == rhs.versioningDirectory && - lhs.versionCountLimit == rhs.versionCountLimit)); + (lhs.versioningStyle == rhs.versioningStyle && + lhs.versioningDirectory == rhs.versioningDirectory)); } |