ICU-461.12.tar.gz

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

diff --git a/icuSources/i18n/nortrans.h b/icuSources/i18n/nortrans.h
index 4dc9f271c0d4c26508433bb86c18df8f5fbd5ce7..634f534f7d410eff50592eb2a3a06621dc09e6fa 100644 (file)
--- a/icuSources/i18n/nortrans.h
+++ b/icuSources/i18n/nortrans.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2006, International Business Machines
+*   Copyright (C) 2001-2010, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -15,7 +15,7 @@
 #if !UCONFIG_NO_TRANSLITERATION
 
 #include "unicode/translit.h"
-#include "unicode/normlzr.h"
+#include "unicode/normalizer2.h"
 
 U_NAMESPACE_BEGIN
 
@@ -23,17 +23,8 @@ U_NAMESPACE_BEGIN
  * A transliterator that performs normalization.
  * @author Alan Liu
  */
-class U_I18N_API NormalizationTransliterator : public Transliterator {
-
-    /**
-     * The normalization mode of this transliterator.
-     */
-    UNormalizationMode fMode;
-
-    /**
-     * Normalization options for this transliterator.
-     */
-    int32_t options;
+class NormalizationTransliterator : public Transliterator {
+    const Normalizer2 &fNorm2;
 
  public:
 
@@ -47,11 +38,6 @@ class U_I18N_API NormalizationTransliterator : public Transliterator {
      */
     NormalizationTransliterator(const NormalizationTransliterator&);
 
-    /**
-     * Assignment operator.
-     */
-    NormalizationTransliterator& operator=(const NormalizationTransliterator&);
-
     /**
      * Transliterator API.
      * @return    A copy of the object.
@@ -66,7 +52,7 @@ class U_I18N_API NormalizationTransliterator : public Transliterator {
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      */
-    static UClassID U_EXPORT2 getStaticClassID();
+    U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
 
  protected:
 
@@ -98,8 +84,13 @@ class U_I18N_API NormalizationTransliterator : public Transliterator {
      * Constructs a transliterator.  This method is private.
      * Public users must use the factory method createInstance().
      */
-    NormalizationTransliterator(const UnicodeString& id,
-                                UNormalizationMode mode, int32_t opt);
+    NormalizationTransliterator(const UnicodeString& id, const Normalizer2 &norm2);
+
+private:
+    /**
+     * Assignment operator.
+     */
+    NormalizationTransliterator& operator=(const NormalizationTransliterator&);
 };
 
 U_NAMESPACE_END