From 3f51cb7d8deb8d6f5a1babe74856f0fe9641fc1e Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 23 Sep 2013 06:52:34 +0000 Subject: [PATCH] ICU-10398 Update #ifndef U_HIDE_XXXXX_API (e.g. DRAFT) to match status tags (e.g. @draft) X-SVN-Rev: 34448 --- icu4c/source/common/unicode/dbbi.h | 1 + icu4c/source/common/unicode/listformatter.h | 14 ++++++++++---- icu4c/source/common/unicode/uchar.h | 4 ++++ icu4c/source/i18n/unicode/calendar.h | 8 ++++---- icu4c/source/i18n/unicode/dcfmtsym.h | 8 +++++++- icu4c/source/i18n/unicode/decimfmt.h | 2 ++ icu4c/source/i18n/unicode/dtitvfmt.h | 17 ----------------- icu4c/source/i18n/unicode/dtitvinf.h | 11 +---------- icu4c/source/i18n/unicode/fmtable.h | 4 ++++ icu4c/source/i18n/unicode/gregocal.h | 7 +++---- icu4c/source/i18n/unicode/msgfmt.h | 2 -- icu4c/source/i18n/unicode/plurrule.h | 6 ++++++ icu4c/source/i18n/unicode/regex.h | 3 --- icu4c/source/i18n/unicode/region.h | 3 --- icu4c/source/i18n/unicode/timezone.h | 2 ++ icu4c/source/i18n/unicode/tzfmt.h | 2 +- icu4c/source/i18n/unicode/ucol.h | 6 ++++-- icu4c/source/i18n/unicode/ucsdet.h | 7 ++++--- icu4c/source/i18n/unicode/udat.h | 4 +++- icu4c/source/i18n/unicode/uformattable.h | 3 +++ icu4c/source/i18n/unicode/unum.h | 14 +++++++++++--- 21 files changed, 70 insertions(+), 58 deletions(-) diff --git a/icu4c/source/common/unicode/dbbi.h b/icu4c/source/common/unicode/dbbi.h index 4b951f0da4a..7187c3c20f9 100644 --- a/icu4c/source/common/unicode/dbbi.h +++ b/icu4c/source/common/unicode/dbbi.h @@ -27,6 +27,7 @@ U_NAMESPACE_BEGIN * An obsolete subclass of RuleBasedBreakIterator. Handling of dictionary- * based break iteration has been folded into the base class. This class * is deprecated as of ICU 3.6. + * @deprecated ICU 3.6 */ typedef RuleBasedBreakIterator DictionaryBasedBreakIterator; diff --git a/icu4c/source/common/unicode/listformatter.h b/icu4c/source/common/unicode/listformatter.h index 0f90e5cbdd4..1d9062e137a 100644 --- a/icu4c/source/common/unicode/listformatter.h +++ b/icu4c/source/common/unicode/listformatter.h @@ -29,6 +29,7 @@ U_NAMESPACE_BEGIN /** @internal */ class Hashtable; +#ifndef U_HIDE_INTERNAL_API /** @internal */ struct ListFormatData : public UMemory { UnicodeString twoPattern; @@ -39,6 +40,7 @@ struct ListFormatData : public UMemory { ListFormatData(const UnicodeString& two, const UnicodeString& start, const UnicodeString& middle, const UnicodeString& end) : twoPattern(two), startPattern(start), middlePattern(middle), endPattern(end) {} }; +#endif /* U_HIDE_INTERNAL_API */ /** @@ -73,14 +75,14 @@ class U_COMMON_API ListFormatter : public UObject{ */ ListFormatter& operator=(const ListFormatter& other); +#ifndef U_HIDE_DEPRECATED_API /** * Creates a ListFormatter appropriate for the default locale. * * @param errorCode ICU error code, set if no data available for default locale. * @return Pointer to a ListFormatter object for the default locale, * created from internal data derived from CLDR data. - * @deprecated - * @draft ICU 50 + * @deprecated ICU 52 (was draft ICU 50) */ static ListFormatter* createInstance(UErrorCode& errorCode); @@ -91,11 +93,12 @@ class U_COMMON_API ListFormatter : public UObject{ * @param errorCode ICU error code, set if no data available for the given locale. * @return A ListFormatter object created from internal data derived from * CLDR data. - * @deprecated - * @draft ICU 50 + * @deprecated ICU 52 (was draft ICU 50) */ static ListFormatter* createInstance(const Locale& locale, UErrorCode& errorCode); +#endif /* U_HIDE_DEPRECATED_API */ +#ifndef U_HIDE_INTERNAL_API /** * Creates a ListFormatter appropriate for a locale and style. * @@ -107,6 +110,7 @@ class U_COMMON_API ListFormatter : public UObject{ * @internal */ static ListFormatter* createInstance(const Locale& locale, const char* style, UErrorCode& errorCode); +#endif /* U_HIDE_INTERNAL_API */ /** * Destructor. @@ -129,10 +133,12 @@ class U_COMMON_API ListFormatter : public UObject{ UnicodeString& format(const UnicodeString items[], int32_t n_items, UnicodeString& appendTo, UErrorCode& errorCode) const; +#ifndef U_HIDE_INTERNAL_API /** * @internal constructor made public for testing. */ ListFormatter(const ListFormatData* listFormatterData); +#endif /* U_HIDE_INTERNAL_API */ private: static void initializeHash(UErrorCode& errorCode); diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h index 9bb144018ce..1a5b71b463e 100644 --- a/icu4c/source/common/unicode/uchar.h +++ b/icu4c/source/common/unicode/uchar.h @@ -521,9 +521,11 @@ typedef enum UProperty { /** String property Case_Folding. Corresponds to u_strFoldCase in ustring.h. @stable ICU 2.4 */ UCHAR_CASE_FOLDING=0x4002, +#ifndef U_HIDE_DEPRECATED_API /** Deprecated string property ISO_Comment. Corresponds to u_getISOComment. @deprecated ICU 49 */ UCHAR_ISO_COMMENT=0x4003, +#endif /* U_HIDE_DEPRECATED_API */ /** String property Lowercase_Mapping. Corresponds to u_strToLower in ustring.h. @stable ICU 2.4 */ UCHAR_LOWERCASE_MAPPING=0x4004, @@ -545,11 +547,13 @@ typedef enum UProperty { /** String property Titlecase_Mapping. Corresponds to u_strToTitle in ustring.h. @stable ICU 2.4 */ UCHAR_TITLECASE_MAPPING=0x400A, +#ifndef U_HIDE_DEPRECATED_API /** String property Unicode_1_Name. This property is of little practical value. Beginning with ICU 49, ICU APIs return an empty string for this property. Corresponds to u_charName(U_UNICODE_10_CHAR_NAME). @deprecated ICU 49 */ UCHAR_UNICODE_1_NAME=0x400B, +#endif /* U_HIDE_DEPRECATED_API */ /** String property Uppercase_Mapping. Corresponds to u_strToUpper in ustring.h. @stable ICU 2.4 */ UCHAR_UPPERCASE_MAPPING=0x400C, diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h index 6832939a450..b3c9587f5b0 100644 --- a/icu4c/source/i18n/unicode/calendar.h +++ b/icu4c/source/i18n/unicode/calendar.h @@ -1708,8 +1708,8 @@ protected: * (YEAR_WOY and WEEK_OF_YEAR) to an extended year in the case * where YEAR, EXTENDED_YEAR are not set. * The Calendar implementation assumes yearWoy is in extended gregorian form - * @internal * @return the extended year, UCAL_EXTENDED_YEAR + * @internal */ virtual int32_t handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t woy); @@ -2388,19 +2388,19 @@ private: #endif /* !UCONFIG_NO_SERVICE */ /** - * @internal * @return TRUE if this calendar has a default century (i.e. 03 -> 2003) + * @internal */ virtual UBool haveDefaultCentury() const = 0; /** - * @internal * @return the start of the default century, as a UDate + * @internal */ virtual UDate defaultCenturyStart() const = 0; /** - * @internal * @return the beginning year of the default century, as a year + * @internal */ virtual int32_t defaultCenturyStartYear() const = 0; diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h index 609ce027ace..0344768b406 100644 --- a/icu4c/source/i18n/unicode/dcfmtsym.h +++ b/icu4c/source/i18n/unicode/dcfmtsym.h @@ -189,6 +189,7 @@ public: */ DecimalFormatSymbols(UErrorCode& status); +#ifndef U_HIDE_DRAFT_API /** * Creates a DecimalFormatSymbols object with last-resort data. * Intended for callers who cache the symbols data and @@ -205,6 +206,7 @@ public: * @draft ICU 52 */ static DecimalFormatSymbols* createWithLastResortData(UErrorCode& status); +#endif /* U_HIDE_DRAFT_API */ /** * Copy constructor. @@ -350,6 +352,7 @@ private: void setCurrencyForSymbols(); public: +#ifndef U_HIDE_INTERNAL_API /** * _Internal_ function - more efficient version of getSymbol, * returning a const reference to one of the symbol strings. @@ -363,7 +366,6 @@ public: */ inline const UnicodeString &getConstSymbol(ENumberFormatSymbol symbol) const; -#ifndef U_HIDE_INTERNAL_API /** * Returns that pattern stored in currecy info. Internal API for use by NumberFormat API. * @internal @@ -418,6 +420,8 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const { return *strPtr; } +#ifndef U_HIDE_INTERNAL_API + inline const UnicodeString & DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { const UnicodeString *strPtr; @@ -429,6 +433,8 @@ DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { return *strPtr; } +#endif /* U_HIDE_INTERNAL_API */ + // ------------------------------------- diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h index ab167ce4711..4c092bad64b 100644 --- a/icu4c/source/i18n/unicode/decimfmt.h +++ b/icu4c/source/i18n/unicode/decimfmt.h @@ -1851,6 +1851,7 @@ public: */ static const char fgNumberPatterns[]; +#ifndef U_HIDE_INTERNAL_API /** * Get a FixedDecimal corresponding to a double as it would be * formatted by this DecimalFormat. @@ -1874,6 +1875,7 @@ public: * @internal */ FixedDecimal getFixedDecimal(DigitList &number, UErrorCode &status) const; +#endif /* U_HIDE_INTERNAL_API */ public: diff --git a/icu4c/source/i18n/unicode/dtitvfmt.h b/icu4c/source/i18n/unicode/dtitvfmt.h index a845391b08e..fb27eec4815 100644 --- a/icu4c/source/i18n/unicode/dtitvfmt.h +++ b/icu4c/source/i18n/unicode/dtitvfmt.h @@ -575,7 +575,6 @@ private: * Also, the first date appears in an interval pattern could be * the earlier date or the later date. * And such information is saved in the interval pattern as well. - * @internal ICU 4.0 */ struct PatternInfo { UnicodeString firstPart; @@ -620,7 +619,6 @@ private: * @param dtItvInfo the DateIntervalInfo object to be adopted. * @param skeleton the skeleton of the date formatter * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ DateIntervalFormat(const Locale& locale, DateIntervalInfo* dtItvInfo, const UnicodeString* skeleton, UErrorCode& status); @@ -637,7 +635,6 @@ private: * @param skeleton the skeleton of this formatter. * @param status Output param set to success/failure code. * @return a date time interval formatter which the caller owns. - * @internal ICU 4.0 */ static DateIntervalFormat* U_EXPORT2 create(const Locale& locale, DateIntervalInfo* dtitvinf, @@ -655,7 +652,6 @@ private: * If it is failure, the returned date formatter will * be NULL. * @return a simple date formatter which the caller owns. - * @internal ICU 4.0 */ static SimpleDateFormat* U_EXPORT2 createSDFPatternInstance( const UnicodeString& skeleton, @@ -685,7 +681,6 @@ private: * On output: the offsets of the alignment field. * @param status output param set to success/failure code on exit * @return Reference to 'appendTo' parameter. - * @internal ICU 4.0 */ UnicodeString& fallbackFormat(Calendar& fromCalendar, Calendar& toCalendar, @@ -728,7 +723,6 @@ private: * * * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void initializePattern(UErrorCode& status); @@ -740,7 +734,6 @@ private: * @param field the largest different calendar field * @param skeleton a skeleton * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void setFallbackPattern(UCalendarDateFields field, const UnicodeString& skeleton, @@ -771,7 +764,6 @@ private: * @param normalizedTime Output parameter for normalized time only * skeleton. * - * @internal ICU 4.0 */ static void U_EXPORT2 getDateTimeSkeleton(const UnicodeString& skeleton, UnicodeString& date, @@ -803,7 +795,6 @@ private: * @return whether the resource is found for the skeleton. * TRUE if interval pattern found for the skeleton, * FALSE otherwise. - * @internal ICU 4.0 */ UBool setSeparateDateTimePtn(const UnicodeString& dateSkeleton, const UnicodeString& timeSkeleton); @@ -833,7 +824,6 @@ private: * through extending skeleton or not. * TRUE if interval pattern is found by * extending skeleton, FALSE otherwise. - * @internal ICU 4.0 */ UBool setIntervalPattern(UCalendarDateFields field, const UnicodeString* skeleton, @@ -869,7 +859,6 @@ private: * 1 means only field width differs * 2 means v/z exchange * @param adjustedIntervalPattern adjusted interval pattern - * @internal ICU 4.0 */ static void U_EXPORT2 adjustFieldWidth( const UnicodeString& inputSkeleton, @@ -889,7 +878,6 @@ private: * @param datePattern date pattern * @param field time calendar field: AM_PM, HOUR, MINUTE * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void concatSingleDate2TimeInterval(const UChar* format, int32_t formatLen, @@ -902,7 +890,6 @@ private: * @param field calendar field need to check * @param skeleton given skeleton on which to check the calendar field * @return true if field present in a skeleton. - * @internal ICU 4.0 */ static UBool U_EXPORT2 fieldExistsInSkeleton(UCalendarDateFields field, const UnicodeString& skeleton); @@ -912,7 +899,6 @@ private: * Split interval patterns into 2 part. * @param intervalPattern interval pattern * @return the index in interval pattern which split the pattern into 2 part - * @internal ICU 4.0 */ static int32_t U_EXPORT2 splitPatternInto2Part(const UnicodeString& intervalPattern); @@ -921,7 +907,6 @@ private: * Break interval patterns as 2 part and save them into pattern info. * @param field calendar field * @param intervalPattern interval pattern - * @internal ICU 4.0 */ void setIntervalPattern(UCalendarDateFields field, const UnicodeString& intervalPattern); @@ -932,7 +917,6 @@ private: * @param field calendar field * @param intervalPattern interval pattern * @param laterDateFirst whether later date appear first in interval pattern - * @internal ICU 4.0 */ void setIntervalPattern(UCalendarDateFields field, const UnicodeString& intervalPattern, @@ -947,7 +931,6 @@ private: * @param secondPart the second part in interval pattern * @param laterDateFirst whether the first date in intervalPattern * is earlier date or later date - * @internal ICU 4.0 */ void setPatternInfo(UCalendarDateFields field, const UnicodeString* firstPart, diff --git a/icu4c/source/i18n/unicode/dtitvinf.h b/icu4c/source/i18n/unicode/dtitvinf.h index 1057c6ecc46..d39207bb5b2 100644 --- a/icu4c/source/i18n/unicode/dtitvinf.h +++ b/icu4c/source/i18n/unicode/dtitvinf.h @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2011, International Business Machines Corporation and + * Copyright (C) 2008-2011,2013, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* * @@ -372,7 +372,6 @@ private: * Initialize the DateIntervalInfo from locale * @param locale the given locale. * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void initializeData(const Locale& locale, UErrorCode& status); @@ -386,7 +385,6 @@ private: * @param intervalPattern the interval pattern on the largest different * calendar unit. * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void setIntervalPatternInternally(const UnicodeString& skeleton, UCalendarDateFields lrgDiffCalUnit, @@ -411,7 +409,6 @@ private: * -1, if there is calendar field difference between * the best match and the input skeleton * @return best match skeleton - * @internal ICU 4.0 */ const UnicodeString* getBestSkeleton(const UnicodeString& skeleton, int8_t& bestMatchDistanceInfo) const; @@ -423,7 +420,6 @@ private: * and adjust pattern field width. * @param skeleton skeleton to be parsed * @param skeletonFieldWidth parsed skeleton field width - * @internal ICU 4.0 */ static void U_EXPORT2 parseSkeleton(const UnicodeString& skeleton, int32_t* skeletonFieldWidth); @@ -439,7 +435,6 @@ private: * @param patternLetter pattern letter char * @return true if one field width is numeric and the other is string, * false otherwise. - * @internal ICU 4.0 */ static UBool U_EXPORT2 stringNumeric(int32_t fieldWidth, int32_t anotherFieldWidth, @@ -458,7 +453,6 @@ private: * @param field calendar field * @param status output param set to success/failure code on exit * @return interval pattern index in hash table - * @internal ICU 4.0 */ static IntervalPatternIndex U_EXPORT2 calendarFieldToIntervalIndex( UCalendarDateFields field, @@ -469,7 +463,6 @@ private: * delete hash table (of type fIntervalPatterns). * * @param hTable hash table to be deleted - * @internal ICU 4.0 */ void deleteHash(Hashtable* hTable); @@ -479,7 +472,6 @@ private: * * @param status output param set to success/failure code on exit * @return hash table initialized - * @internal ICU 4.0 */ Hashtable* initHash(UErrorCode& status); @@ -491,7 +483,6 @@ private: * @param source the source to copy from * @param target the target to copy to * @param status output param set to success/failure code on exit - * @internal ICU 4.0 */ void copyHash(const Hashtable* source, Hashtable* target, UErrorCode& status); diff --git a/icu4c/source/i18n/unicode/fmtable.h b/icu4c/source/i18n/unicode/fmtable.h index 9a9d5b56b30..5edf9175e10 100644 --- a/icu4c/source/i18n/unicode/fmtable.h +++ b/icu4c/source/i18n/unicode/fmtable.h @@ -598,6 +598,7 @@ public: */ static UClassID U_EXPORT2 getStaticClassID(); +#ifndef U_HIDE_DRAFT_API /** * Convert the UFormattable to a Formattable. Internally, this is a reinterpret_cast. * @param fmt a valid UFormattable @@ -631,6 +632,7 @@ public: * @draft ICU 52 */ inline const UFormattable *toUFormattable() const; +#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DEPRECATED_API /** @@ -736,6 +738,7 @@ inline int32_t Formattable::getLong(UErrorCode* status) const { } #endif /* U_HIDE_DEPRECATED_API */ +#ifndef U_HIDE_DRAFT_API inline UFormattable* Formattable::toUFormattable() { return reinterpret_cast(this); } @@ -751,6 +754,7 @@ inline Formattable* Formattable::fromUFormattable(UFormattable *fmt) { inline const Formattable* Formattable::fromUFormattable(const UFormattable *fmt) { return reinterpret_cast(fmt); } +#endif /* U_HIDE_DRAFT_API */ U_NAMESPACE_END diff --git a/icu4c/source/i18n/unicode/gregocal.h b/icu4c/source/i18n/unicode/gregocal.h index b92376aea03..e6ae4d6a1df 100644 --- a/icu4c/source/i18n/unicode/gregocal.h +++ b/icu4c/source/i18n/unicode/gregocal.h @@ -688,7 +688,6 @@ public: * (Gregorian) 00:00:00 UTC, that is, October 4, 1582 (Julian) is followed * by October 15, 1582 (Gregorian). This corresponds to Julian day number * 2299161. This is measured from the standard epoch, not in Julian Days. - * @internal */ UDate fGregorianCutover; @@ -751,20 +750,20 @@ public: public: // internal implementation /** - * @internal * @return TRUE if this calendar has the notion of a default century + * @internal */ virtual UBool haveDefaultCentury() const; /** - * @internal * @return the start of the default century + * @internal */ virtual UDate defaultCenturyStart() const; /** - * @internal * @return the beginning year of the default century + * @internal */ virtual int32_t defaultCenturyStartYear() const; }; diff --git a/icu4c/source/i18n/unicode/msgfmt.h b/icu4c/source/i18n/unicode/msgfmt.h index a207c2bbad1..5de91e41ff7 100644 --- a/icu4c/source/i18n/unicode/msgfmt.h +++ b/icu4c/source/i18n/unicode/msgfmt.h @@ -1047,7 +1047,6 @@ private: * for public consumption. * @param listCount Output parameter to receive the size of array * @return The array of formattable types in the pattern - * @internal */ const Formattable::Type* getArgTypeList(int32_t& listCount) const { listCount = argTypeCount; @@ -1062,7 +1061,6 @@ private: /** * A DummyFormatter that we use solely to store a NULL value. UHash does * not support storing NULL values. - * @internal */ class U_I18N_API DummyFormat : public Format { public: diff --git a/icu4c/source/i18n/unicode/plurrule.h b/icu4c/source/i18n/unicode/plurrule.h index f4c389912d3..c36b1a829d1 100644 --- a/icu4c/source/i18n/unicode/plurrule.h +++ b/icu4c/source/i18n/unicode/plurrule.h @@ -282,6 +282,7 @@ public: */ static PluralRules* U_EXPORT2 forLocale(const Locale& locale, UPluralType type, UErrorCode& status); +#ifndef U_HIDE_INTERNAL_API /** * Return a StringEnumeration over the locales for which there is plurals data. * @return a StringEnumeration over the locales available. @@ -296,6 +297,7 @@ public: * @internal */ static UBool hasOverride(const Locale &locale); +#endif /* U_HIDE_INTERNAL_API */ /** * Given a number, returns the keyword of the first rule that applies to @@ -319,10 +321,12 @@ public: */ UnicodeString select(double number) const; +#ifndef U_HIDE_INTERNAL_API /** * @internal */ UnicodeString select(const FixedDecimal &number) const; +#endif /* U_HIDE_INTERNAL_API */ /** * Returns a list of all rule keywords used in this PluralRules @@ -412,11 +416,13 @@ public: */ UnicodeString getKeywordOther() const; +#ifndef U_HIDE_INTERNAL_API /** * * @internal */ UnicodeString getRules() const; +#endif /* U_HIDE_INTERNAL_API */ /** * Compares the equality of two PluralRules objects. diff --git a/icu4c/source/i18n/unicode/regex.h b/icu4c/source/i18n/unicode/regex.h index e9f64902af7..e356a9e14f4 100644 --- a/icu4c/source/i18n/unicode/regex.h +++ b/icu4c/source/i18n/unicode/regex.h @@ -370,7 +370,6 @@ private: * or in a UText, using * utext_openUChars(UText *ut, const UChar *text, int64_t textLength, UErrorCode *status); * - * @internal */ RegexMatcher *matcher(const UChar *input, UErrorCode &status) const; @@ -728,7 +727,6 @@ private: * or in a UText, using * utext_openUChars(UText *ut, const UChar *text, int64_t textLength, UErrorCode *status); * - * @internal */ RegexMatcher(const UnicodeString ®exp, const UChar *input, uint32_t flags, UErrorCode &status); @@ -1133,7 +1131,6 @@ private: * or in a UText, using * utext_openUChars(UText *ut, const UChar *text, int64_t textLength, UErrorCode *status); * - * @internal */ RegexMatcher &reset(const UChar *input); public: diff --git a/icu4c/source/i18n/unicode/region.h b/icu4c/source/i18n/unicode/region.h index 12490bba7f2..0efb0a98bf2 100644 --- a/icu4c/source/i18n/unicode/region.h +++ b/icu4c/source/i18n/unicode/region.h @@ -199,8 +199,6 @@ private: /** * Default Constructor. Internal - use factory methods only. - * - * @internal */ Region(); @@ -212,7 +210,6 @@ private: * * If the region data has already loaded, then this method simply returns without doing * anything meaningful. - * @internal */ static void loadRegionData(); diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h index e0547566320..6be60e07108 100644 --- a/icu4c/source/i18n/unicode/timezone.h +++ b/icu4c/source/i18n/unicode/timezone.h @@ -870,6 +870,7 @@ private: static const UChar* getRegion(const UnicodeString& id); public: +#ifndef U_HIDE_INTERNAL_API /** * Returns the region code associated with the given zone, * or NULL if the zone is not known. @@ -879,6 +880,7 @@ private: * @internal */ static const UChar* getRegion(const UnicodeString& id, UErrorCode& status); +#endif /* U_HIDE_INTERNAL_API */ private: /** diff --git a/icu4c/source/i18n/unicode/tzfmt.h b/icu4c/source/i18n/unicode/tzfmt.h index b4adc93b5f5..fa8e8d64442 100644 --- a/icu4c/source/i18n/unicode/tzfmt.h +++ b/icu4c/source/i18n/unicode/tzfmt.h @@ -194,7 +194,7 @@ typedef enum UTimeZoneFormatGMTOffsetPatternType { * Number of UTimeZoneFormatGMTOffsetPatternType types. * @internal */ - UTZFMT_PAT_COUNT + UTZFMT_PAT_COUNT = 6 } UTimeZoneFormatGMTOffsetPatternType; /** diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h index 97a5917f603..5a459b52af4 100644 --- a/icu4c/source/i18n/unicode/ucol.h +++ b/icu4c/source/i18n/unicode/ucol.h @@ -302,6 +302,7 @@ typedef enum { * @stable ICU 2.0 */ UCOL_STRENGTH, +#ifndef U_HIDE_DEPRECATED_API /** When turned on, this attribute positions Hiragana before all * non-ignorables on quaternary level This is a sneaky way to produce JIS * sort order. @@ -312,7 +313,8 @@ typedef enum { * Since ICU 50, this attribute is not settable any more via API functions. * @deprecated ICU 50 Implementation detail, cannot be set via API, might be removed from implementation. */ - UCOL_HIRAGANA_QUATERNARY_MODE, + UCOL_HIRAGANA_QUATERNARY_MODE = UCOL_STRENGTH + 1, +#endif /* U_HIDE_DEPRECATED_API */ /** When turned on, this attribute generates a collation key * for the numeric value of substrings of digits. * This is a way to get '100' to sort AFTER '2'. Note that the longest @@ -322,7 +324,7 @@ typedef enum { * separate digit substring associated with a separate collation element. * @stable ICU 2.8 */ - UCOL_NUMERIC_COLLATION, + UCOL_NUMERIC_COLLATION = UCOL_STRENGTH + 2, /** * The number of UColAttribute constants. * @stable ICU 2.0 diff --git a/icu4c/source/i18n/unicode/ucsdet.h b/icu4c/source/i18n/unicode/ucsdet.h index d9b86a38955..d3a297be1e1 100644 --- a/icu4c/source/i18n/unicode/ucsdet.h +++ b/icu4c/source/i18n/unicode/ucsdet.h @@ -373,7 +373,7 @@ ucsdet_isInputFilterEnabled(const UCharsetDetector *ucsd); U_STABLE UBool U_EXPORT2 ucsdet_enableInputFilter(UCharsetDetector *ucsd, UBool filter); - +#ifndef U_HIDE_INTERNAL_API /** * Get an iterator over the set of detectable charsets - * over the charsets that are enabled by the specified charset detector. @@ -387,7 +387,7 @@ ucsdet_enableInputFilter(UCharsetDetector *ucsd, UBool filter); * the specified charset detector. * @internal */ -U_DRAFT UEnumeration * U_EXPORT2 +U_INTERNAL UEnumeration * U_EXPORT2 ucsdet_getDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *status); /** @@ -403,8 +403,9 @@ ucsdet_getDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *status); * is not supported, U_ILLEGAL_ARGUMENT_ERROR is set. * @internal */ -U_DRAFT void U_EXPORT2 +U_INTERNAL void U_EXPORT2 ucsdet_setDetectableCharset(UCharsetDetector *ucsd, const char *encoding, UBool enabled, UErrorCode *status); +#endif /* U_HIDE_INTERNAL_API */ #endif #endif /* __UCSDET_H */ diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h index 5c542d65990..72eaaee6e44 100644 --- a/icu4c/source/i18n/unicode/udat.h +++ b/icu4c/source/i18n/unicode/udat.h @@ -848,7 +848,7 @@ typedef enum UDateFormatBooleanAttribute { UDAT_BOOLEAN_ATTRIBUTE_COUNT } UDateFormatBooleanAttribute; - +#ifndef U_HIDE_INTERNAL_API /** * Get a boolean attribute associated with a UDateFormat. * An example would be a true value for a key of UDAT_PARSE_ALLOW_WHITESPACE indicating allowing whitespace leniency. @@ -875,6 +875,8 @@ udat_getBooleanAttribute(const UDateFormat* fmt, UDateFormatBooleanAttribute att U_INTERNAL void U_EXPORT2 udat_setBooleanAttribute(UDateFormat *fmt, UDateFormatBooleanAttribute attr, UBool, UErrorCode* status); +#endif /* U_HIDE_INTERNAL_API */ + #if U_SHOW_CPLUSPLUS_API diff --git a/icu4c/source/i18n/unicode/uformattable.h b/icu4c/source/i18n/unicode/uformattable.h index 1f79e5aca0b..36c25766504 100644 --- a/icu4c/source/i18n/unicode/uformattable.h +++ b/icu4c/source/i18n/unicode/uformattable.h @@ -32,6 +32,8 @@ #if !UCONFIG_NO_FORMATTING +#ifndef U_HIDE_DRAFT_API + #include "unicode/localpointer.h" /** @@ -274,6 +276,7 @@ ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status); */ U_DRAFT const char * U_EXPORT2 ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status); +#endif /* U_HIDE_DRAFT_API */ #endif diff --git a/icu4c/source/i18n/unicode/unum.h b/icu4c/source/i18n/unicode/unum.h index 2635b6dfc9e..dce77332e96 100644 --- a/icu4c/source/i18n/unicode/unum.h +++ b/icu4c/source/i18n/unicode/unum.h @@ -233,7 +233,7 @@ typedef enum UNumberFormatRoundingMode { */ UNUM_FOUND_HALFEVEN = UNUM_ROUND_HALFEVEN, #endif /* U_HIDE_DEPRECATED_API */ - UNUM_ROUND_HALFDOWN, + UNUM_ROUND_HALFDOWN = UNUM_ROUND_HALFEVEN + 1, UNUM_ROUND_HALFUP, /** * ROUND_UNNECESSARY reports an error if formatted result is not exact. @@ -562,6 +562,7 @@ unum_formatDoubleCurrency(const UNumberFormat* fmt, UFieldPosition* pos, UErrorCode* status); +#ifndef U_HIDE_DRAFT_API /** * Format a UFormattable into a string. * @param fmt the formatter to use @@ -589,6 +590,7 @@ unum_formatUFormattable(const UNumberFormat* fmt, int32_t resultLength, UFieldPosition *pos, UErrorCode *status); +#endif /* U_HIDE_DRAFT_API */ /** * Parse a string into an integer using a UNumberFormat. @@ -724,6 +726,7 @@ unum_parseDoubleCurrency(const UNumberFormat* fmt, UChar* currency, UErrorCode* status); +#ifndef U_HIDE_DRAFT_API /** * Parse a UChar string into a UFormattable. * Example code: @@ -749,6 +752,7 @@ unum_parseToUFormattable(const UNumberFormat* fmt, int32_t textLength, int32_t* parsePos, /* 0 = start */ UErrorCode* status); +#endif /* U_HIDE_DRAFT_API */ /** * Set the pattern used by a UNumberFormat. This can only be used @@ -866,7 +870,7 @@ typedef enum UNumberFormatAttribute { * This is an internal ICU API. Do not use. * @internal */ - UNUM_PARSE_ALL_INPUT, + UNUM_PARSE_ALL_INPUT = UNUM_LENIENT_PARSE + 1, #endif #ifndef U_HIDE_DRAFT_API /** @@ -881,14 +885,16 @@ typedef enum UNumberFormatAttribute { UNUM_SCALE = UNUM_LENIENT_PARSE + 2, #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_INTERNAL_API /** Count of "regular" numeric attributes. * @internal */ - UNUM_NUMERIC_ATTRIBUTE_COUNT, + UNUM_NUMERIC_ATTRIBUTE_COUNT = UNUM_LENIENT_PARSE + 3, /** One below the first bitfield-boolean item. * All items after this one are stored in boolean form. * @internal */ UNUM_MAX_NONBOOLEAN_ATTRIBUTE = 0x0FFF, +#endif /* U_HIDE_INTERNAL_API */ /** If 1, specifies that if setting the "max integer digits" attribute would truncate a value, set an error status rather than silently truncating. * For example, formatting the value 1234 with 4 max int digits would succeed, but formatting 12345 would fail. There is no effect on parsing. @@ -904,9 +910,11 @@ typedef enum UNumberFormatAttribute { */ UNUM_PARSE_NO_EXPONENT, +#ifndef U_HIDE_INTERNAL_API /** Limit of boolean attributes. * @internal */ UNUM_LIMIT_BOOLEAN_ATTRIBUTE +#endif /* U_HIDE_INTERNAL_API */ } UNumberFormatAttribute; /**