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.cpp | |
parent | 5.10 (diff) | |
download | FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2 FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip |
5.11
Diffstat (limited to 'structures.cpp')
-rw-r--r-- | structures.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/structures.cpp b/structures.cpp index 0d7b1825..54db613c 100644 --- a/structures.cpp +++ b/structures.cpp @@ -33,7 +33,7 @@ std::wstring zen::getVariantName(DirectionConfig::Variant var) switch (var) { case DirectionConfig::AUTOMATIC: - return _("<Automatic>"); + return _("<- Two way ->"); case DirectionConfig::MIRROR: return _("Mirror ->>"); case DirectionConfig::UPDATE: @@ -441,22 +441,22 @@ MainConfiguration zen::merge(const std::vector<MainConfiguration>& mainCfgs) { const CompConfig& cmpCfg = *fp->altCmpConfig; - auto iter = std::find_if(cmpCfgStat.begin(), cmpCfgStat.end(), + auto it = std::find_if(cmpCfgStat.begin(), cmpCfgStat.end(), [&](const std::pair<CompConfig, int>& entry) { return entry.first == cmpCfg; }); - if (iter == cmpCfgStat.end()) + if (it == cmpCfgStat.end()) cmpCfgStat.push_back(std::make_pair(cmpCfg, 1)); else - ++(iter->second); + ++(it->second); } { const SyncConfig& syncCfg = *fp->altSyncConfig; - auto iter = std::find_if(syncCfgStat.begin(), syncCfgStat.end(), + auto it = std::find_if(syncCfgStat.begin(), syncCfgStat.end(), [&](const std::pair<SyncConfig, int>& entry) { return entry.first == syncCfg; }); - if (iter == syncCfgStat.end()) + if (it == syncCfgStat.end()) syncCfgStat.push_back(std::make_pair(syncCfg, 1)); else - ++(iter->second); + ++(it->second); } } |