summaryrefslogtreecommitdiff
path: root/algorithm.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:23:19 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:23:19 +0200
commit0887aee8c54d0ed51bb2031431e2bcdafebb4c6e (patch)
tree69537ceb9787bb25ac363cc4e6cdaf0804d78363 /algorithm.cpp
parent5.12 (diff)
downloadFreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.tar.gz
FreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.tar.bz2
FreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.zip
5.13
Diffstat (limited to 'algorithm.cpp')
-rw-r--r--algorithm.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/algorithm.cpp b/algorithm.cpp
index 0c47410a..05b840ff 100644
--- a/algorithm.cpp
+++ b/algorithm.cpp
@@ -1237,7 +1237,7 @@ void categorize(const std::set<FileSystemObject*>& rowsIn,
if (it != hasRecyclerBuffer.end())
return it->second;
return hasRecyclerBuffer.insert(std::make_pair(baseDirPf, recycleBinStatusUpdating(baseDirPf, callback) == STATUS_REC_EXISTS)).first->second;
-#else
+#elif defined FFS_LINUX || defined FFS_MAC
return true;
#endif
};
@@ -1444,14 +1444,13 @@ void zen::deleteFromGridAndHD(const std::vector<FileSystemObject*>& rowsToDelete
if (useRecycleBin &&
std::any_of(hasRecyclerBuffer.begin(), hasRecyclerBuffer.end(), [](std::pair<Zstring, bool> item) { return !item.second; }))
{
- std::wstring warningMessage = _("Recycle Bin is not available for the following paths! Files will be deleted permanently instead:");
- warningMessage += L"\n";
+ std::wstring msg = _("Recycle Bin is not available for the following paths! Files will be deleted permanently instead:") + L"\n";
for (auto it = hasRecyclerBuffer.begin(); it != hasRecyclerBuffer.end(); ++it)
if (!it->second)
- warningMessage += L"\n" + utfCvrtTo<std::wstring>(it->first);
+ msg += std::wstring(L"\n") + it->first;
- statusHandler.reportWarning(warningMessage, warningRecyclerMissing);
+ statusHandler.reportWarning(msg, warningRecyclerMissing);
}
deleteFromGridAndHDOneSide<LEFT_SIDE>(deleteRecylerLeft, true, statusHandler);
bgstack15