ICU-2515 Make uenum_openStringEnumeration() public, rename to uenum_openFromStringEnumeration()

X-SVN-Rev: 25619
This commit is contained in:
Andy Heninger 2009-03-18 20:23:40 +00:00
parent fa03e6079a
commit 2a788397fd
5 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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));

View File

@ -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

View File

@ -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

View File

@ -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);
}