Rename ForEachNameRef -> ForEachName with rvalue reference functor passing.

3 files changed, 5 insertions, 7 deletions

diff --git a/coding/coding_tests/multilang_utf8_string_test.cpp b/coding/coding_tests/multilang_utf8_string_test.cpp
index 6934a6660e..4b694454f7 100644
--- a/coding/coding_tests/multilang_utf8_string_test.cpp
+++ b/coding/coding_tests/multilang_utf8_string_test.cpp
@@ -74,8 +74,7 @@ UNIT_TEST(MultilangString_ForEach)
   for (size_t i = 0; i < ARRAY_SIZE(gArr); ++i)
     s.AddString(gArr[i].m_lang, gArr[i].m_str);
 
-  LangChecker doClass;
-  s.ForEachRef(doClass);
+  s.ForEach(LangChecker());
 }
 
 UNIT_TEST(MultilangString_Unique)
diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index a3432c07e8..eac7ea4513 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -139,14 +139,13 @@ struct Finder
 int8_t StringUtf8Multilang::FindString(string const & utf8s) const
 {
   Finder finder(utf8s);
-  ForEachRef(finder);
+  ForEach(finder);
   return finder.m_res;
 }
 
 string DebugPrint(StringUtf8Multilang const & s)
 {
   string out;
-  Printer printer(out);
-  s.ForEachRef(printer);
+  s.ForEach(Printer(out));
   return out;
 }
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index 7c0efce963..7fe6f8ff3e 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -64,14 +64,14 @@ public:
   }
 
   template <class T>
-  void ForEachRef(T && functor) const
+  void ForEach(T && fn) const
   {
     size_t i = 0;
     size_t const sz = m_s.size();
     while (i < sz)
     {
       size_t const next = GetNextIndex(i);
-      if (!functor((m_s[i] & 0x3F), m_s.substr(i + 1, next - i - 1)))
+      if (!fn((m_s[i] & 0x3F), m_s.substr(i + 1, next - i - 1)))
         return;
       i = next;
     }