ICU-6.2.14.tar.gz

[apple/icu.git] / icuSources / i18n / toupptrn.h

diff --git a/icuSources/i18n/toupptrn.h b/icuSources/i18n/toupptrn.h
index cf828b724062563fca8be6219b13aa1676a22a0a..d1796832cda4d5a74aa4db3d9e1cb253f04912f5 100644 (file)
--- a/icuSources/i18n/toupptrn.h
+++ b/icuSources/i18n/toupptrn.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

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

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


@@ -16,6 +16,7 @@
 
 #include "unicode/translit.h"
 #include "unicode/locid.h"
 
 #include "unicode/translit.h"
 #include "unicode/locid.h"

+#include "casetrn.h"

 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 


@@ -24,7 +25,7 @@ U_NAMESPACE_BEGIN
  * case mapping.
  * @author Alan Liu
  */
  * case mapping.
  * @author Alan Liu
  */

-class U_I18N_API UppercaseTransliterator : public Transliterator {
+class U_I18N_API UppercaseTransliterator : public CaseMapTransliterator {

 
  public:
 
 
  public:
 


@@ -53,49 +54,21 @@ class U_I18N_API UppercaseTransliterator : public Transliterator {
      * Transliterator API.
      * @return a copy of the object.
      */
      * Transliterator API.
      * @return a copy of the object.
      */

-    Transliterator* clone(void) const;
+    virtual Transliterator* clone(void) const;

 
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *
      * @draft ICU 2.2
      */
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *
      * @draft ICU 2.2
      */

-    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
+    virtual UClassID getDynamicClassID() const;

 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *
      * @draft ICU 2.2
      */
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *
      * @draft ICU 2.2
      */

-    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
-
- protected:
-
-
-    /**
-     * Implements {@link Transliterator#handleTransliterate}.
-     * @param text        the buffer holding transliterated and
-     *                    untransliterated text
-     * @param offset      the start and limit of the text, the position
-     *                    of the cursor, and the start and limit of transliteration.
-     * @param incremental if true, assume more text may be coming after
-     *                    pos.contextLimit.  Otherwise, assume the text is complete.
-     */
-    virtual void handleTransliterate(Replaceable& text,
-                                     UTransPosition& offsets, 
-                                     UBool isIncremental) const;
-
- private:
-
-    Locale loc;
-    UChar* buffer;
-    static const char _ID[];
-
-    /**
-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
-     */
-    static const char fgClassID;
+    static UClassID U_EXPORT2 getStaticClassID();

 };
 
 U_NAMESPACE_END
 };
 
 U_NAMESPACE_END