ICU-13358 ICU 60rc BRS, update U_HIDE_ conditionals

X-SVN-Rev: 40589

diff --git a/icu4c/source/common/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h
index 7364ab33ac83ed626013e15952e4fb8019b59d09..a0319bf0a76af523ff4ec556d855ff706369f2a2 100644 (file)
--- a/icu4c/source/common/unicode/filteredbrk.h
+++ b/icu4c/source/common/unicode/filteredbrk.h
@@ -55,6 +55,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
    */
   static FilteredBreakIteratorBuilder *createInstance(const Locale& where, UErrorCode& status);
 
+#ifndef U_HIDE_DEPRECATED_API
   /**
    * This function has been deprecated in favor of createEmptyInstance, which has
    * identical behavior.
@@ -66,7 +67,9 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
   static inline FilteredBreakIteratorBuilder *createInstance(UErrorCode &status) {
     return createEmptyInstance(status);
   }
+#endif  /* U_HIDE_DEPRECATED_API */
 
+#ifndef U_HIDE_DRAFT_API
   /**
    * Construct an empty FilteredBreakIteratorBuilder.
    * In this state, it will not suppress any segment boundaries.
@@ -75,6 +78,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
    * @draft ICU 60
    */
   static FilteredBreakIteratorBuilder *createEmptyInstance(UErrorCode &status);
+#endif  /* U_HIDE_DRAFT_API */
 
   /**
    * Suppress a certain string from being the end of a segment.
@@ -101,6 +105,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
    */
   virtual UBool unsuppressBreakAfter(const UnicodeString& string, UErrorCode& status) = 0;
 
+#ifndef U_HIDE_DEPRECATED_API
   /**
    * This function has been deprecated in favor of wrapIteratorWithFilter()
    * The behavior is identical.
@@ -111,7 +116,9 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
    * @see wrapBreakIteratorWithFilter()
    */
   virtual BreakIterator *build(BreakIterator* adoptBreakIterator, UErrorCode& status) = 0;
+#endif  /* U_HIDE_DEPRECATED_API */
 
+#ifndef U_HIDE_DRAFT_API
   /**
    * Wrap (adopt) an existing break iterator in a new filtered instance.
    * The resulting BreakIterator is owned by the caller.
@@ -128,6 +135,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
   inline BreakIterator *wrapIteratorWithFilter(BreakIterator* adoptBreakIterator, UErrorCode& status) {
     return build(adoptBreakIterator, status);
   }
+#endif  /* U_HIDE_DRAFT_API */
 
  protected:
   /**

diff --git a/icu4c/source/common/unicode/rbbi.h b/icu4c/source/common/unicode/rbbi.h
index 302d9ffc651568a24cbb70b138166c2fd92238ec..521e502f1190cc8aea31fbf11134aefd83d4c5d5 100644 (file)
--- a/icu4c/source/common/unicode/rbbi.h
+++ b/icu4c/source/common/unicode/rbbi.h
@@ -691,11 +691,13 @@ private:
     const LanguageBreakEngine *getLanguageBreakEngine(UChar32 c);
 
   public:
+#ifndef U_HIDE_INTERNAL_API
     /**
      *   Debugging function only.
      *   @internal
      */
      void dumpCache();
+#endif  /* U_HIDE_INTERNAL_API */
 };
 
 //------------------------------------------------------------------------------

diff --git a/icu4c/source/common/unicode/unorm.h b/icu4c/source/common/unicode/unorm.h
index 1b5af16700fb9fbc7053a39cb19da2fb3c6c5589..3839de129573c19b05247ae9d35c2b294ee41f38 100644 (file)
--- a/icu4c/source/common/unicode/unorm.h
+++ b/icu4c/source/common/unicode/unorm.h
@@ -210,7 +210,7 @@ enum {
  *         the output was truncated, and the error code is set to U_BUFFER_OVERFLOW_ERROR.
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 unorm_normalize(const UChar *source, int32_t sourceLength,
                 UNormalizationMode mode, int32_t options,
                 UChar *result, int32_t resultLength,
@@ -236,7 +236,7 @@ unorm_normalize(const UChar *source, int32_t sourceLength,
  * @see unorm_isNormalized
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE UNormalizationCheckResult U_EXPORT2
+U_DEPRECATED UNormalizationCheckResult U_EXPORT2
 unorm_quickCheck(const UChar *source, int32_t sourcelength,
                  UNormalizationMode mode,
                  UErrorCode *status);
@@ -257,7 +257,7 @@ unorm_quickCheck(const UChar *source, int32_t sourcelength,
  * @see unorm_isNormalized
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE UNormalizationCheckResult U_EXPORT2
+U_DEPRECATED UNormalizationCheckResult U_EXPORT2
 unorm_quickCheckWithOptions(const UChar *src, int32_t srcLength,
                             UNormalizationMode mode, int32_t options,
                             UErrorCode *pErrorCode);
@@ -283,7 +283,7 @@ unorm_quickCheckWithOptions(const UChar *src, int32_t srcLength,
  * @see unorm_quickCheck
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE UBool U_EXPORT2
+U_DEPRECATED UBool U_EXPORT2
 unorm_isNormalized(const UChar *src, int32_t srcLength,
                    UNormalizationMode mode,
                    UErrorCode *pErrorCode);
@@ -305,7 +305,7 @@ unorm_isNormalized(const UChar *src, int32_t srcLength,
  * @see unorm_isNormalized
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE UBool U_EXPORT2
+U_DEPRECATED UBool U_EXPORT2
 unorm_isNormalizedWithOptions(const UChar *src, int32_t srcLength,
                               UNormalizationMode mode, int32_t options,
                               UErrorCode *pErrorCode);
@@ -383,7 +383,7 @@ unorm_isNormalizedWithOptions(const UChar *src, int32_t srcLength,
  *
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 unorm_next(UCharIterator *src,
            UChar *dest, int32_t destCapacity,
            UNormalizationMode mode, int32_t options,
@@ -416,7 +416,7 @@ unorm_next(UCharIterator *src,
  *
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 unorm_previous(UCharIterator *src,
                UChar *dest, int32_t destCapacity,
                UNormalizationMode mode, int32_t options,
@@ -460,7 +460,7 @@ unorm_previous(UCharIterator *src,
  *
  * @deprecated ICU 56 Use unorm2.h instead.
  */
-U_STABLE int32_t U_EXPORT2
+U_DEPRECATED int32_t U_EXPORT2
 unorm_concatenate(const UChar *left, int32_t leftLength,
                   const UChar *right, int32_t rightLength,
                   UChar *dest, int32_t destCapacity,

diff --git a/icu4c/source/i18n/unicode/currunit.h b/icu4c/source/i18n/unicode/currunit.h
index db36d2b40fa65cfdc12245a8c9cff2f791aff8b7..5ad23b1f58a3a85c5208a9cbab2fb26c43cf27fa 100644 (file)
--- a/icu4c/source/i18n/unicode/currunit.h
+++ b/icu4c/source/i18n/unicode/currunit.h
@@ -58,6 +58,7 @@ class U_I18N_API CurrencyUnit: public MeasureUnit {
      */
     CurrencyUnit(const CurrencyUnit& other);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Copy constructor from MeasureUnit. This constructor allows you to
      * restore a CurrencyUnit that was sliced to MeasureUnit.
@@ -67,6 +68,7 @@ class U_I18N_API CurrencyUnit: public MeasureUnit {
      * @draft ICU 60
      */
     CurrencyUnit(const MeasureUnit& measureUnit, UErrorCode &ec);
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Assignment operator

diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 7ccc21522ede6931afc6dd028cfeeb38e26ee5b6..4dc6f950f294ca424a93e221720767280fa439ee 100644 (file)
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -185,6 +185,7 @@ public:
      */
     DecimalFormatSymbols(const Locale& locale, UErrorCode& status);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Creates a DecimalFormatSymbols instance for the given locale with digits and symbols
      * corresponding to the given NumberingSystem.
@@ -202,6 +203,7 @@ public:
      * @draft ICU 60
      */
     DecimalFormatSymbols(const Locale& locale, const NumberingSystem& ns, UErrorCode& status);
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Create a DecimalFormatSymbols object for the default locale.

diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index bd8d2ab2bab4c8da2b610ca2a5d0493c81430565..790053636d59573ff8c47f53ef706ab05094854e 100644 (file)
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -1964,14 +1964,12 @@ public:
     UCurrencyUsage getCurrencyUsage() const;
 
 
-#ifndef U_HIDE_DEPRECATED_API
     /**
      * The resource tags we use to retrieve decimal format data from
      * locale resource bundles.
      * @deprecated ICU 3.4. This string has no public purpose. Please don't use it.
      */
     static const char fgNumberPatterns[];
-#endif  /* U_HIDE_DEPRECATED_API */
 
 #ifndef U_HIDE_INTERNAL_API
     /**

diff --git a/icu4c/source/i18n/unicode/dtitvinf.h b/icu4c/source/i18n/unicode/dtitvinf.h
index 9c647699370dfeba6ac0d9a04222a3add3f94ea8..726e34a745a2ec30ba567b59efb37139f6f13d31 100644 (file)
--- a/icu4c/source/i18n/unicode/dtitvinf.h
+++ b/icu4c/source/i18n/unicode/dtitvinf.h
@@ -152,8 +152,6 @@ U_NAMESPACE_BEGIN
 
 class U_I18N_API DateIntervalInfo U_FINAL : public UObject {
 public:
-    // Do not enclose the protected default constructor with #ifndef U_HIDE_INTERNAL_API
-    // or else the compiler will create a public default constructor.
     /**
      * Default constructor.
      * It does not initialize any interval patterns except

diff --git a/icu4c/source/i18n/unicode/nounit.h b/icu4c/source/i18n/unicode/nounit.h
index cfc9ba2bcfe0bd7294fff4a8bfa04a06e031871b..04fc84b33aa338ffb26092a413871aebd2ac20c3 100644 (file)
--- a/icu4c/source/i18n/unicode/nounit.h
+++ b/icu4c/source/i18n/unicode/nounit.h
@@ -23,6 +23,7 @@
 
 U_NAMESPACE_BEGIN
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Dimensionless unit for percent and permille.
  * @see NumberFormatter
@@ -99,7 +100,7 @@ private:
     NoUnit(const char* subtype);
 
 };
-
+#endif  /* U_HIDE_DRAFT_API */
 
 U_NAMESPACE_END
 

diff --git a/icu4c/source/i18n/unicode/tznames.h b/icu4c/source/i18n/unicode/tznames.h
index 60f0e5e4a1a975d234713866d18efae89495e2a5..399265d85ae66cb8b8489b58c5a355e03f4466c1 100644 (file)
--- a/icu4c/source/i18n/unicode/tznames.h
+++ b/icu4c/source/i18n/unicode/tznames.h
@@ -291,14 +291,12 @@ public:
     virtual UnicodeString& getDisplayName(const UnicodeString& tzID, UTimeZoneNameType type, UDate date, UnicodeString& name) const;
 
     /**
-     * @internal For specific users only until proposed publicly.
-     * @deprecated This API is ICU internal only.
+     * @internal ICU internal only, for specific users only until proposed publicly.
      */
     virtual void loadAllDisplayNames(UErrorCode& status);
 
     /**
-     * @internal For specific users only until proposed publicly.
-     * @deprecated This API is ICU internal only.
+     * @internal ICU internal only, for specific users only until proposed publicly.
      */
     virtual void getDisplayNames(const UnicodeString& tzID, const UTimeZoneNameType types[], int32_t numTypes, UDate date, UnicodeString dest[], UErrorCode& status) const;