From ecb1524f8da7901338b263384fed3c612f117b4c Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:22:36 +0200 Subject: 5.11 --- zen/recycler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zen/recycler.cpp') diff --git a/zen/recycler.cpp b/zen/recycler.cpp index c35dca56..07803e50 100644 --- a/zen/recycler.cpp +++ b/zen/recycler.cpp @@ -94,8 +94,8 @@ void zen::recycleOrDelete(const std::vector& filenames, CallbackRecycli replaceCpy(_("Cannot load file %x."), L"%x", fmtFileName(getDllName()))); std::vector cNames; - for (auto iter = filenames.begin(); iter != filenames.end(); ++iter) //caution to not create temporary strings here!! - cNames.push_back(iter->c_str()); + for (auto it = filenames.begin(); it != filenames.end(); ++it) //caution to not create temporary strings here!! + cNames.push_back(it->c_str()); CallbackData cbd(callback); if (!moveToRecycler(&cNames[0], cNames.size(), recyclerCallback, &cbd)) @@ -114,9 +114,9 @@ void zen::recycleOrDelete(const std::vector& filenames, CallbackRecycli else //regular recycle bin usage: available since XP { Zstring filenamesDoubleNull; - for (auto iter = filenames.begin(); iter != filenames.end(); ++iter) + for (auto it = filenames.begin(); it != filenames.end(); ++it) { - filenamesDoubleNull += *iter; + filenamesDoubleNull += *it; filenamesDoubleNull += L'\0'; } -- cgit