From b3f70d8d46199524edc590269a73c262899763c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 8 Sep 2011 00:07:56 +0300 Subject: Replace most iterator to const_iterator. Some other minor changes. --- src/utils/stringutils.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/utils/stringutils.cpp') diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 176c5499c..f3aed5276 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -185,10 +185,11 @@ unsigned long findI(std::string text, std::vector &list) { std::string str = toLower(text); unsigned long idx; - for (std::vector::iterator i = list.begin(); + for (std::vector::const_iterator i = list.begin(); i != list.end(); ++i) { - std::string subStr = toLower(*i); + std::string subStr = *i; + subStr = toLower(subStr); idx = str.find(subStr); if (idx != std::string::npos) return idx; @@ -450,8 +451,8 @@ std::string combineDye2(std::string file, std::string dye) file = file.substr(0, pos); std::list list1 = splitToStringList(dye1, ';'); std::list list2 = splitToStringList(dye, ';'); - std::list::iterator it1, it1_end = list1.end(); - std::list::iterator it2, it2_end = list2.end(); + std::list::const_iterator it1, it1_end = list1.end(); + std::list::const_iterator it2, it2_end = list2.end(); for (it1 = list1.begin(), it2 = list2.begin(); it1 != it1_end && it2 != it2_end; ++it1, ++it2) { @@ -485,7 +486,7 @@ std::vector getLang() std::string packList(std::list &list) { - std::list::iterator i = list.begin(); + std::list::const_iterator i = list.begin(); std::string str = ""; while (i != list.end()) { -- cgit v1.2.3-60-g2f50