ICU-8.11.tar.gz

[apple/icu.git] / icuSources / i18n / esctrn.cpp

diff --git a/icuSources/i18n/esctrn.cpp b/icuSources/i18n/esctrn.cpp
index 95c8a1dc8c14c5ab4dc35d13bc485f0aba24b629..93f13f5816c766461a14f3fac563462d159d34da 100644 (file)
--- a/icuSources/i18n/esctrn.cpp
+++ b/icuSources/i18n/esctrn.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (c) 2001-2004, International Business Machines
+*   Copyright (c) 2001-2006, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description


@@ -32,28 +32,28 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(EscapeTransliterator)
 /**
  * Factory methods
  */
 /**
  * Factory methods
  */

-Transliterator* EscapeTransliterator::_createUnicode(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscUnicode(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // Unicode: "U+10FFFF" hex, min=4, max=6
     return new EscapeTransliterator(ID, UNIPRE, EMPTY, 16, 4, TRUE, NULL);
 }
     // Unicode: "U+10FFFF" hex, min=4, max=6
     return new EscapeTransliterator(ID, UNIPRE, EMPTY, 16, 4, TRUE, NULL);
 }

-Transliterator* EscapeTransliterator::_createJava(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscJava(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // Java: "\\uFFFF" hex, min=4, max=4
     return new EscapeTransliterator(ID, BS_u, EMPTY, 16, 4, FALSE, NULL);
 }
     // Java: "\\uFFFF" hex, min=4, max=4
     return new EscapeTransliterator(ID, BS_u, EMPTY, 16, 4, FALSE, NULL);
 }

-Transliterator* EscapeTransliterator::_createC(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscC(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // C: "\\uFFFF" hex, min=4, max=4; \\U0010FFFF hex, min=8, max=8
     return new EscapeTransliterator(ID, BS_u, EMPTY, 16, 4, TRUE,
              new EscapeTransliterator(EMPTY, BS_U, EMPTY, 16, 8, TRUE, NULL));
 }
     // C: "\\uFFFF" hex, min=4, max=4; \\U0010FFFF hex, min=8, max=8
     return new EscapeTransliterator(ID, BS_u, EMPTY, 16, 4, TRUE,
              new EscapeTransliterator(EMPTY, BS_U, EMPTY, 16, 8, TRUE, NULL));
 }

-Transliterator* EscapeTransliterator::_createXML(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscXML(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // XML: "" hex, min=1, max=6
     return new EscapeTransliterator(ID, XMLPRE, SEMI, 16, 1, TRUE, NULL);
 }
     // XML: "" hex, min=1, max=6
     return new EscapeTransliterator(ID, XMLPRE, SEMI, 16, 1, TRUE, NULL);
 }

-Transliterator* EscapeTransliterator::_createXML10(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscXML10(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // XML10: "&1114111;" dec, min=1, max=7 (not really "Any-Hex")
     return new EscapeTransliterator(ID, XML10PRE, SEMI, 10, 1, TRUE, NULL);
 }
     // XML10: "&1114111;" dec, min=1, max=7 (not really "Any-Hex")
     return new EscapeTransliterator(ID, XML10PRE, SEMI, 10, 1, TRUE, NULL);
 }

-Transliterator* EscapeTransliterator::_createPerl(const UnicodeString& ID, Token /*context*/) {
+static Transliterator* _createEscPerl(const UnicodeString& ID, Transliterator::Token /*context*/) {

     // Perl: "\\x{263A}" hex, min=1, max=6
     return new EscapeTransliterator(ID, PERLPRE, RBRACE, 16, 1, TRUE, NULL);
 }
     // Perl: "\\x{263A}" hex, min=1, max=6
     return new EscapeTransliterator(ID, PERLPRE, RBRACE, 16, 1, TRUE, NULL);
 }


@@ -65,19 +65,19 @@ Transliterator* EscapeTransliterator::_createPerl(const UnicodeString& ID, Token
 void EscapeTransliterator::registerIDs() {
     Token t = integerToken(0);
 
 void EscapeTransliterator::registerIDs() {
     Token t = integerToken(0);
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Unicode"), _createUnicode, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Unicode"), _createEscUnicode, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Java"), _createJava, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Java"), _createEscJava, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/C"), _createC, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/C"), _createEscC, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/XML"), _createXML, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/XML"), _createEscXML, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/XML10"), _createXML10, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/XML10"), _createEscXML10, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Perl"), _createPerl, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex/Perl"), _createEscPerl, t);

 
 

-    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex"), _createJava, t);
+    Transliterator::_registerFactory(UNICODE_STRING_SIMPLE("Any-Hex"), _createEscJava, t);

 }
 
 /**
 }
 
 /**