ICU-491.11.1.tar.gz

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

diff --git a/icuSources/i18n/titletrn.h b/icuSources/i18n/titletrn.h
index 4a5ac4164cecb78e33cc5eecee6724336f95de99..a093152b66cbdb96f310d8af1b2be8812554a822 100644 (file)
--- a/icuSources/i18n/titletrn.h
+++ b/icuSources/i18n/titletrn.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

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

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


@@ -15,7 +15,8 @@
 #if !UCONFIG_NO_TRANSLITERATION
 
 #include "unicode/translit.h"
 #if !UCONFIG_NO_TRANSLITERATION
 
 #include "unicode/translit.h"

-#include "unicode/locid.h"
+#include "ucase.h"
+#include "casetrn.h"

 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 


@@ -26,20 +27,14 @@ U_NAMESPACE_BEGIN
  * case using <code>u_totitle()</code>.
  * @author Alan Liu
  */
  * case using <code>u_totitle()</code>.
  * @author Alan Liu
  */

-class U_I18N_API TitlecaseTransliterator : public Transliterator {
-
-    /**
-     * ID for this transliterator.
-     */
-    static const char _ID[];
-
+class TitlecaseTransliterator : public CaseMapTransliterator {

  public:
 
     /**
      * Constructs a transliterator.
      * @param loc the given locale.
      */
  public:
 
     /**
      * Constructs a transliterator.
      * @param loc the given locale.
      */

-    TitlecaseTransliterator(const Locale& loc = Locale::getDefault());
+    TitlecaseTransliterator();

 
     /**
      * Destructor.
 
     /**
      * Destructor.


@@ -51,32 +46,23 @@ class U_I18N_API TitlecaseTransliterator : public Transliterator {
      */
     TitlecaseTransliterator(const TitlecaseTransliterator&);
 
      */
     TitlecaseTransliterator(const TitlecaseTransliterator&);
 

-    /**
-     * Assignment operator.
-     */
-    TitlecaseTransliterator& operator=(const TitlecaseTransliterator&);
-

     /**
      * 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.
 
     /**
      * 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.
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.

-     *
-     * @draft ICU 2.2

      */
      */

-    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+    U_I18N_API static UClassID U_EXPORT2 getStaticClassID();

 
 

- protected:
+protected:

 
     /**
      * Implements {@link Transliterator#handleTransliterate}.
 
     /**
      * Implements {@link Transliterator#handleTransliterate}.


@@ -87,25 +73,14 @@ class U_I18N_API TitlecaseTransliterator : public Transliterator {
      * @param incremental if true, assume more text may be coming after
      *                    pos.contextLimit.  Otherwise, assume the text is complete.
      */
      * @param incremental if true, assume more text may be coming after
      *                    pos.contextLimit.  Otherwise, assume the text is complete.
      */

-    void handleTransliterate(Replaceable& text, UTransPosition& offset,
+    virtual void handleTransliterate(Replaceable& text, UTransPosition& offset,

                              UBool isIncremental) const;
 
                              UBool isIncremental) const;
 

- public:
-
-    /**
-     * Static memory cleanup function.  FOR INTERNAL USE ONLY; DO NOT
-     * CALL.
-     */
-    static void cleanup();
- private:
-    Locale loc;
-    UChar* buffer;
-
+private:

     /**
     /**

-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
+     * Assignment operator.

      */
      */

-    static const char fgClassID;
+    TitlecaseTransliterator& operator=(const TitlecaseTransliterator&);

 };
 
 U_NAMESPACE_END
 };
 
 U_NAMESPACE_END