Improve iterators part 2.

2 files changed, 5 insertions, 8 deletions

diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 9d57c58a7..fcafd7711 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -207,7 +207,8 @@ size_t findI(std::string text, StringVect &list)
 {
     std::string str = toLower(text);
     size_t idx;
-    for (StringVectCIter i = list.begin(); i != list.end(); ++ i)
+    for (StringVectCIter i = list.begin(), i_end = list.end();
+         i != i_end; ++ i)
     {
         std::string subStr = *i;
         subStr = toLower(subStr);
@@ -482,9 +483,8 @@ std::string combineDye2(std::string file, std::string dye)
         file = file.substr(0, pos);
         std::list<std::string> list1 = splitToStringList(dye1, ';');
         std::list<std::string> list2 = splitToStringList(dye, ';');
-        std::list<std::string>::const_iterator it1, it1_end = list1.end();
-        std::list<std::string>::const_iterator it2, it2_end = list2.end();
-        for (it1 = list1.begin(), it2 = list2.begin();
+        for (std::list<std::string>::const_iterator it1 = list1.begin(),
+             it2 = list2.begin(), it1_end = list1.end(), it2_end = list2.end();
              it1 != it1_end && it2 != it2_end; ++it1, ++it2)
         {
             str += (*it1) + ":" + (*it2) + ";";
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 81fb612e4..dab6958d3 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -63,10 +63,7 @@ PoDict *TranslationManager::loadLang(LangVect lang,
     std::string name = "";
     PoParser parser;
 
-    LangIter it = lang.begin();
-    LangIter it_end = lang.end();
-
-    for (; it != it_end; ++ it)
+    for (LangIter it = lang.begin(), it_end = lang.end(); it != it_end; ++ it)
     {
         if (*it == "C")
             continue;