From 2a788397fd785ae6b5401a15e8a57cede3a64e95 Mon Sep 17 00:00:00 2001
From: Andy Heninger <andy.heninger@gmail.com>
Date: Wed, 18 Mar 2009 20:23:40 +0000
Subject: [PATCH] ICU-2515 Make uenum_openStringEnumeration() public, rename to
 uenum_openFromStringEnumeration()

X-SVN-Rev: 25619
---
 icu4c/source/common/unicode/uenum.h | 2 +-
 icu4c/source/common/ustrenum.cpp    | 4 ++--
 icu4c/source/i18n/ucal.cpp          | 4 ++--
 icu4c/source/i18n/ucol_res.cpp      | 2 +-
 icu4c/source/i18n/udatpg.cpp        | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/icu4c/source/common/unicode/uenum.h b/icu4c/source/common/unicode/uenum.h
index cd473059ca8..619c7a2b1e2 100644
--- a/icu4c/source/common/unicode/uenum.h
+++ b/icu4c/source/common/unicode/uenum.h
@@ -147,7 +147,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
  * @draft ICU 4.2
  */
 U_CAPI UEnumeration* U_EXPORT2
-uenum_openStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec);
+uenum_openFromStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec);
 
 #endif
 
diff --git a/icu4c/source/common/ustrenum.cpp b/icu4c/source/common/ustrenum.cpp
index ddda2f2e41b..3b62cfc5a8e 100644
--- a/icu4c/source/common/ustrenum.cpp
+++ b/icu4c/source/common/ustrenum.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2002-2008, International Business Machines
+* Copyright (c) 2002-2009, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -231,7 +231,7 @@ U_CDECL_END
  * delete it (regardless of error status).
  */
 U_CAPI UEnumeration* U_EXPORT2
-uenum_openStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec) { 
+uenum_openFromStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec) { 
     UEnumeration* result = NULL;
     if (U_SUCCESS(*ec) && adopted != NULL) {
         result = (UEnumeration*) uprv_malloc(sizeof(UEnumeration));
diff --git a/icu4c/source/i18n/ucal.cpp b/icu4c/source/i18n/ucal.cpp
index 7423007831f..dda10e974ff 100644
--- a/icu4c/source/i18n/ucal.cpp
+++ b/icu4c/source/i18n/ucal.cpp
@@ -45,12 +45,12 @@ _createTimeZone(const UChar* zoneID, int32_t len, UErrorCode* ec) {
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openTimeZones(UErrorCode* ec) {
-    return uenum_openStringEnumeration(TimeZone::createEnumeration(), ec);
+    return uenum_openFromStringEnumeration(TimeZone::createEnumeration(), ec);
 }
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openCountryTimeZones(const char* country, UErrorCode* ec) {
-    return uenum_openStringEnumeration(TimeZone::createEnumeration(country), ec);
+    return uenum_openFromStringEnumeration(TimeZone::createEnumeration(country), ec);
 }
 
 U_CAPI int32_t U_EXPORT2
diff --git a/icu4c/source/i18n/ucol_res.cpp b/icu4c/source/i18n/ucol_res.cpp
index a0bc15211fb..a812498f514 100644
--- a/icu4c/source/i18n/ucol_res.cpp
+++ b/icu4c/source/i18n/ucol_res.cpp
@@ -708,7 +708,7 @@ ucol_openAvailableLocales(UErrorCode *status) {
         *status = U_MEMORY_ALLOCATION_ERROR;
         return NULL;
     }
-    return uenum_openStringEnumeration(s, status);
+    return uenum_openFromStringEnumeration(s, status);
 }
 #endif
 
diff --git a/icu4c/source/i18n/udatpg.cpp b/icu4c/source/i18n/udatpg.cpp
index 6122912b6be..554384a9ded 100644
--- a/icu4c/source/i18n/udatpg.cpp
+++ b/icu4c/source/i18n/udatpg.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2007, International Business Machines
+*   Copyright (C) 2009, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -221,14 +221,14 @@ udatpg_replaceFieldTypes(UDateTimePatternGenerator *dtpg,
 
 U_DRAFT UEnumeration * U_EXPORT2
 udatpg_openSkeletons(const UDateTimePatternGenerator *dtpg, UErrorCode *pErrorCode) {
-    return uenum_openStringEnumeration(
+    return uenum_openFromStringEnumeration(
                 ((DateTimePatternGenerator *)dtpg)->getSkeletons(*pErrorCode),
                 pErrorCode);
 }
 
 U_DRAFT UEnumeration * U_EXPORT2
 udatpg_openBaseSkeletons(const UDateTimePatternGenerator *dtpg, UErrorCode *pErrorCode) {
-    return uenum_openStringEnumeration(
+    return uenum_openFromStringEnumeration(
                 ((DateTimePatternGenerator *)dtpg)->getBaseSkeletons(*pErrorCode),
                 pErrorCode);
 }