summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-20 20:43:54 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-20 23:48:07 +0300
commit2744e4fa8f39cd06bfe557a5a3881830bd11501c (patch)
tree2ec96c6ee820cfe0e5e76480fe828501bf555a4b /src/utils
parent531433248fbad49e2b8e9d90de9855f3ea9b2257 (diff)
downloadmanaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.gz
manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.bz2
manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.xz
manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.zip
Last part with FOR_EACH changes.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/paths.cpp3
-rw-r--r--src/utils/stringutils.cpp3
-rw-r--r--src/utils/translation/translationmanager.cpp2
3 files changed, 3 insertions, 5 deletions
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;