From 2744e4fa8f39cd06bfe557a5a3881830bd11501c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Jan 2013 20:43:54 +0300 Subject: Last part with FOR_EACH changes. --- src/utils/paths.cpp | 3 +-- src/utils/stringutils.cpp | 3 +-- src/utils/translation/translationmanager.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/utils') diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index bf4cd5e48..6f10262f6 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -155,8 +155,7 @@ std::string getDesktopDir() file = std::string(xdg) + "/user-dirs.dirs"; StringVect arr = ResourceManager::loadTextFileLocal(file); - for (StringVectCIter it = arr.begin(), it_end = arr.end(); - it != it_end; ++ it) + FOR_EACH (StringVectCIter, it, arr) { std::string str = *it; if (findCutFirst(str, "XDG_DESKTOP_DIR=\"")) diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 14e30b659..7786002e5 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -208,8 +208,7 @@ size_t findI(std::string text, StringVect &list) { std::string str = toLower(text); size_t idx; - for (StringVectCIter i = list.begin(), i_end = list.end(); - i != i_end; ++ i) + FOR_EACH (StringVectCIter, i, list) { std::string subStr = *i; subStr = toLower(subStr); diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 6378b0290..e15ff0c0a 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -63,7 +63,7 @@ PoDict *TranslationManager::loadLang(LangVect lang, std::string name; PoParser parser; - for (LangIter it = lang.begin(), it_end = lang.end(); it != it_end; ++ it) + FOR_EACH (LangIter, it, lang) { if (*it == "C") continue; -- cgit v1.2.3-70-g09d2