ICU-62123.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / tmutfmt.h

diff --git a/icuSources/i18n/unicode/tmutfmt.h b/icuSources/i18n/unicode/tmutfmt.h
index 1b45ef3b37d8e7cc0b6512b486e9b479600b7b32..686d1f670062fc8171c57ed1194e22cee21dccff 100644 (file)
--- a/icuSources/i18n/unicode/tmutfmt.h
+++ b/icuSources/i18n/unicode/tmutfmt.h
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  *******************************************************************************
  * Copyright (C) 2008-2014, Google, International Business Machines Corporation
@@ -17,6 +19,7 @@
 
 
 #if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DEPRECATED_API
 
 #include "unicode/unistr.h"
 #include "unicode/tmunit.h"
@@ -25,7 +28,6 @@
 #include "unicode/numfmt.h"
 #include "unicode/plurrule.h"
 
-#ifndef U_HIDE_DEPRECATED_API
 
 /**
  * Constants for various styles.
@@ -44,15 +46,14 @@ enum UTimeUnitFormatStyle {
 };
 typedef enum UTimeUnitFormatStyle UTimeUnitFormatStyle; /**< @deprecated ICU 53 */
 
-#endif  /* U_HIDE_DEPRECATED_API */
-
 
+#if U_SHOW_CPLUSPLUS_API
 U_NAMESPACE_BEGIN
 
 class Hashtable;
 class UVector;
 
-#ifndef U_HIDE_DEPRECATED_API
+struct TimeUnitFormatReadSink;
 
 /**
  * Format or parse a TimeUnitAmount, using plural rules for the units where available.
@@ -90,31 +91,31 @@ public:
     /**
      * Create TimeUnitFormat with default locale, and full name style.
      * Use setLocale and/or setFormat to modify.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(UErrorCode& status);
 
     /**
      * Create TimeUnitFormat given locale, and full name style.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const Locale& locale, UErrorCode& status);
 
     /**
      * Create TimeUnitFormat given locale and style.
-     * @stable ICU 4.8
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const Locale& locale, UTimeUnitFormatStyle style, UErrorCode& status);
 
     /**
      * Copy constructor.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat(const TimeUnitFormat&);
 
     /**
      * deconstructor
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual ~TimeUnitFormat();
 
@@ -122,13 +123,13 @@ public:
      * Clone this Format object polymorphically. The caller owns the result and
      * should delete it when done.
      * @return    A copy of the object.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual Format* clone(void) const;
 
     /**
      * Assignment operator
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     TimeUnitFormat& operator=(const TimeUnitFormat& other);
 
@@ -137,7 +138,7 @@ public:
      * Objects of different subclasses are considered unequal.
      * @param other the object to be compared with.
      * @return      true if the given Format objects are not semantically equal.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     UBool operator!=(const Format& other) const;
 
@@ -145,7 +146,7 @@ public:
      * Set the locale used for formatting or parsing.
      * @param locale  the locale to be set
      * @param status  output param set to success/failure code on exit
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     void setLocale(const Locale& locale, UErrorCode& status);
 
@@ -154,14 +155,14 @@ public:
      * Set the number format used for formatting or parsing.
      * @param format  the number formatter to be set
      * @param status  output param set to success/failure code on exit
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     void setNumberFormat(const NumberFormat& format, UErrorCode& status);
 
     /**
      * Parse a TimeUnitAmount.
      * @see Format#parseObject(const UnicodeString&, Formattable&, ParsePosition&) const;
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual void parseObject(const UnicodeString& source,
                              Formattable& result,
@@ -176,7 +177,7 @@ public:
      * .       erived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     static UClassID U_EXPORT2 getStaticClassID(void);
 
@@ -189,7 +190,7 @@ public:
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
-     * @stable ICU 4.2
+     * @deprecated ICU 53
      */
     virtual UClassID getDynamicClassID(void) const;
 
@@ -231,6 +232,7 @@ private:
     // UTIMEUNIT_YEAR.
     static const char* getTimeUnitName(TimeUnit::UTimeUnitFields field, UErrorCode& status);
 
+    friend struct TimeUnitFormatReadSink;
 };
 
 inline UBool
@@ -238,10 +240,10 @@ TimeUnitFormat::operator!=(const Format& other) const  {
     return !operator==(other);
 }
 
-#endif /* U_HIDE_DEPRECATED_API */
-
 U_NAMESPACE_END
+#endif // U_SHOW_CPLUSPLUS_API
 
+#endif /* U_HIDE_DEPRECATED_API */
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // __TMUTFMT_H__