ICU-12410 C++ foldCase()->fold()

X-SVN-Rev: 39676

diff --git a/icu4c/source/common/unicode/casemap.h b/icu4c/source/common/unicode/casemap.h
index 0abd06068b1762de74bdcfd4cd85eea1b19f108a..262b5e2ce193abb3330add0de7dc796b9183d374 100644 (file)
--- a/icu4c/source/common/unicode/casemap.h
+++ b/icu4c/source/common/unicode/casemap.h
@@ -146,7 +146,7 @@ public:
     /**
      * Case-folds a UTF-16 string and optionally records edits.
      *
-     * Case-folding is locale-independent and not context-sensitive,
+     * Case folding is locale-independent and not context-sensitive,
      * but there is an option for whether to include or exclude mappings for dotted I
      * and dotless i that are marked with 'T' in CaseFolding.txt.
      *
@@ -174,7 +174,7 @@ public:
      * @see u_strFoldCase
      * @draft ICU 59
      */
-    static int32_t foldCase(
+    static int32_t fold(
             uint32_t options,
             const UChar *src, int32_t srcLength,
             UChar *dest, int32_t destCapacity, Edits *edits,

diff --git a/icu4c/source/common/ustrcase.cpp b/icu4c/source/common/ustrcase.cpp
index 6661bdc497a85cda360910f6cb616923230a2af5..9c1e570099f8e736d7631748ce968addfecca36b 100644 (file)
--- a/icu4c/source/common/ustrcase.cpp
+++ b/icu4c/source/common/ustrcase.cpp
@@ -1198,7 +1198,7 @@ u_strFoldCase(UChar *dest, int32_t destCapacity,
 
 U_NAMESPACE_BEGIN
 
-int32_t CaseMap::foldCase(
+int32_t CaseMap::fold(
         uint32_t options,
         const UChar *src, int32_t srcLength,
         UChar *dest, int32_t destCapacity, Edits *edits,

diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp
index 6c5da17dd7e7dcb9623ea7212e5cc0694e4ca79b..c6f6d7a48cdf47da9c83cd8f46bb4cbdfcbd05e8 100644 (file)
--- a/icu4c/source/test/intltest/strcase.cpp
+++ b/icu4c/source/test/intltest/strcase.cpp
@@ -1068,8 +1068,8 @@ void StringCaseTest::TestCaseMapWithEdits() {
             TRUE, errorCode);
 
     edits.reset();
-    length = CaseMap::foldCase(UCASEMAP_OMIT_UNCHANGED_TEXT | U_FOLD_CASE_EXCLUDE_SPECIAL_I,
-                               (const UChar *)u"IßtanBul", 8, dest, UPRV_LENGTHOF(dest), &edits, errorCode);
+    length = CaseMap::fold(UCASEMAP_OMIT_UNCHANGED_TEXT | U_FOLD_CASE_EXCLUDE_SPECIAL_I,
+                           (const UChar *)u"IßtanBul", 8, dest, UPRV_LENGTHOF(dest), &edits, errorCode);
     assertEquals((const UChar *)u"foldCase(IßtanBul)", UnicodeString((const UChar *)u"ıssb"), UnicodeString(TRUE, dest, length));
     static const EditChange foldExpectedChanges[] = {
             { TRUE, 1, 1 },