organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-3685 Use different function names.

Browse source 
X-SVN-Rev: 14910
This commit is contained in:
George Rhoten 2004-04-08 23:24:45 +00:00
parent de1f8d59d0
commit 3c981b5db7
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/i18n/calendar.cpp
View file

@ -322,7 +322,7 @@ public:
// -------------------------------------
static ICULocaleService*
getService(void)
getCalendarService(void)
{
UBool needInit;
{
@ -379,11 +379,11 @@ getService(void)
URegistryKey Calendar::registerFactory(ICUServiceFactory* toAdopt, UErrorCode& status)
{
return getService()->registerFactory(toAdopt, status);
return getCalendarService()->registerFactory(toAdopt, status);
}
UBool Calendar::unregister(URegistryKey key, UErrorCode& status) {
return getService()->unregister(key, status);
return getCalendarService()->unregister(key, status);
}
// -------------------------------------
@ -605,7 +605,7 @@ Calendar*
Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& success)
{
Locale actualLoc;
UObject* u = getService()->get(aLocale, LocaleKey::KIND_ANY, &actualLoc, success);
UObject* u = getCalendarService()->get(aLocale, LocaleKey::KIND_ANY, &actualLoc, success);
Calendar* c = NULL;
if(U_FAILURE(success) || !u) {
@ -642,7 +642,7 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
// Don't overwrite actualLoc, since the actual loc from this call
// may be something like "@calendar=gregorian" -- TODO investigate
// further...
c = (Calendar*)getService()->get(l, LocaleKey::KIND_ANY, &actualLoc2, success);
c = (Calendar*)getCalendarService()->get(l, LocaleKey::KIND_ANY, &actualLoc2, success);
if(U_FAILURE(success) || !c) {
delete zone;

6
icu4c/source/i18n/numfmt.cpp
View file

@ -508,7 +508,7 @@ public:
// -------------------------------------
static ICULocaleService*
getService(void)
getNumberFormatService(void)
{
UBool needInit;
{
@ -555,7 +555,7 @@ NumberFormat::createInstance(const Locale& loc, EStyles kind, UErrorCode& status
URegistryKey
NumberFormat::registerFactory(NumberFormatFactory* toAdopt, UErrorCode& status)
{
ICULocaleService *service = getService();
ICULocaleService *service = getNumberFormatService();
if (service) {
return service->registerFactory(new NFFactory(toAdopt), status);
}
@ -584,7 +584,7 @@ NumberFormat::unregister(URegistryKey key, UErrorCode& status)
StringEnumeration*
NumberFormat::getAvailableLocales(void)
{
ICULocaleService *service = getService();
ICULocaleService *service = getNumberFormatService();
if (service) {
return service->getAvailableLocales();
}

6
icu4c/source/i18n/tridpars.cpp
View file

@ -301,7 +301,7 @@ static void U_CALLCONV _deleteSingleID(void* obj) {
delete (TransliteratorIDParser::SingleID*) obj;
}
static void U_CALLCONV _deleteTransliterator(void* obj) {
static void U_CALLCONV _deleteTransliteratorTrIDPars(void* obj) {
delete (Transliterator*) obj;
}
U_CDECL_END
@ -458,7 +458,7 @@ int32_t TransliteratorIDParser::instantiateList(UVector& list,
if (U_FAILURE(ec)) {
goto RETURN;
}
tlist.setDeleter(_deleteTransliterator);
tlist.setDeleter(_deleteTransliteratorTrIDPars);
Transliterator* t;
int32_t i;
@ -512,7 +512,7 @@ int32_t TransliteratorIDParser::instantiateList(UVector& list,
list.removeAllElements();
if (U_SUCCESS(ec)) {
list.setDeleter(_deleteTransliterator);
list.setDeleter(_deleteTransliteratorTrIDPars);
while (tlist.size() > 0) {
t = (Transliterator*) tlist.orphanElementAt(0);