From 3c981b5db75a8111f6c4feb92bb2181e4fd945a9 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Thu, 8 Apr 2004 23:24:45 +0000
Subject: [PATCH] ICU-3685 Use different function names.

X-SVN-Rev: 14910
---
 icu4c/source/i18n/calendar.cpp | 10 +++++-----
 icu4c/source/i18n/numfmt.cpp   |  6 +++---
 icu4c/source/i18n/tridpars.cpp |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 7eb97b1b673..dcec071a0e5 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -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;
diff --git a/icu4c/source/i18n/numfmt.cpp b/icu4c/source/i18n/numfmt.cpp
index 1ead0e6390c..c5673cfbb0b 100644
--- a/icu4c/source/i18n/numfmt.cpp
+++ b/icu4c/source/i18n/numfmt.cpp
@@ -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();
   }
diff --git a/icu4c/source/i18n/tridpars.cpp b/icu4c/source/i18n/tridpars.cpp
index 5574373aead..ffd34ecd5f8 100644
--- a/icu4c/source/i18n/tridpars.cpp
+++ b/icu4c/source/i18n/tridpars.cpp
@@ -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);