ICU-64243.0.1.tar.gz

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

diff --git a/icuSources/i18n/currfmt.h b/icuSources/i18n/currfmt.h
index 659b1ad73825cdfb2e00f3e496aaa651b14605bb..cc9bb3c1bacd05f88c0fd4bf2c340c285cd7e79a 100644 (file)
--- a/icuSources/i18n/currfmt.h
+++ b/icuSources/i18n/currfmt.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2004, International Business Machines
+* Copyright (c) 2004-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -33,7 +35,7 @@ class NumberFormat;
  * @author Alan Liu
  * @internal
  */
-class U_I18N_API CurrencyFormat : public MeasureFormat {
+class CurrencyFormat : public MeasureFormat {
 
  public:
 
@@ -52,16 +54,14 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
      */
     virtual ~CurrencyFormat();
 
-    /**
-     * Override Format API.
-     */
-    virtual UBool operator==(const Format& other) const;
-
     /**
      * Override Format API.
      */
     virtual Format* clone() const;
 
+
+    using MeasureFormat::format;
+
     /**
      * Override Format API.
      */
@@ -70,13 +70,6 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
                                   FieldPosition& pos,
                                   UErrorCode& ec) const;
 
-    /**
-     * Redeclare Format API to prevent hiding.
-     */
-    UnicodeString& format(const Formattable& obj,
-                          UnicodeString& appendTo,
-                          UErrorCode& ec) const;
-
     /**
      * Override Format API.
      */
@@ -84,13 +77,6 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
                              Formattable& result,
                              ParsePosition& pos) const;
 
-    /**
-     * Redeclare Format API to prevent hiding.
-     */
-    void parseObject(const UnicodeString& source,
-                     Formattable& result,
-                     UErrorCode& ec) const;
-
     /**
      * Override Format API.
      */
@@ -100,10 +86,6 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
      * Returns the class ID for this class.
      */
     static UClassID U_EXPORT2 getStaticClassID();
-
- private:
-
-    NumberFormat* fmt;
 };
 
 U_NAMESPACE_END