X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..0f5d89e82340278ed3d7d50029f37cab2c41a57e:/icuSources/i18n/nultrans.h

diff --git a/icuSources/i18n/nultrans.h b/icuSources/i18n/nultrans.h
index cd008631..a01b04e9 100644
--- a/icuSources/i18n/nultrans.h
+++ b/icuSources/i18n/nultrans.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-*   Copyright (c) 2000-2003, International Business Machines
+*   Copyright (c) 2000-2007, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -23,22 +25,10 @@ U_NAMESPACE_BEGIN
  * @author Alan Liu
  * @internal Use transliterator factory methods instead since this class will be removed in that release.
  */
-class U_I18N_API NullTransliterator : public Transliterator {
+class NullTransliterator : public Transliterator {
 
 public:
 
-    /**
-     * ID for this transliterator.
-     * @internal Use transliterator factory methods instead since this class will be removed in that release.
-     */
-    static const UChar ID[]; // public for Transliterator
-
-    /**
-     * ID for this transliterator.
-     * @internal Use transliterator factory methods instead since this class will be removed in that release.
-     */
-    static const UChar SHORT_ID[]; // public for Transliterator
-
     /**
      * Constructs a transliterator.
      * @internal Use transliterator factory methods instead since this class will be removed in that release.
@@ -55,7 +45,7 @@ public:
      * Transliterator API.
      * @internal Use transliterator factory methods instead since this class will be removed in that release.
      */
-    Transliterator* clone(void) const;
+    virtual Transliterator* clone(void) const;
 
     /**
      * Implements {@link Transliterator#handleTransliterate}.
@@ -66,39 +56,16 @@ public:
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
-     *
-     * @draft ICU 2.2
      */
-    virtual inline UClassID getDynamicClassID() const;
+    virtual UClassID getDynamicClassID() const;
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
-     *
-     * @draft ICU 2.2
      */
-    static inline UClassID getStaticClassID();
+    U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
 
-private:
-
-    /**
-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
-     */
-    static const char fgClassID;
 };
 
-inline NullTransliterator::NullTransliterator() : Transliterator(ID, 0) {}
-
-inline NullTransliterator::~NullTransliterator() {}
-
-inline UClassID
-NullTransliterator::getStaticClassID()
-{ return (UClassID)&fgClassID; }
-
-inline UClassID
-NullTransliterator::getDynamicClassID() const
-{ return NullTransliterator::getStaticClassID(); }
-
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */