diff --git a/icu4c/source/i18n/unicode/coll.h b/icu4c/source/i18n/unicode/coll.h index f31c8cb3a73..add6b5ba368 100644 --- a/icu4c/source/i18n/unicode/coll.h +++ b/icu4c/source/i18n/unicode/coll.h @@ -869,7 +869,6 @@ public: virtual UColAttributeValue getAttribute(UColAttribute attr, UErrorCode &status) const = 0; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft methods since they are virtual */ /** * Sets the variable top to the top of the specified reordering group. * The variable top determines the highest-sorting character @@ -886,7 +885,7 @@ public: * function chaining. (See User Guide for details.) * @return *this * @see getMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ virtual Collator &setMaxVariable(UColReorderCode group, UErrorCode &errorCode); @@ -896,7 +895,7 @@ public: * The base class implementation returns UCOL_REORDER_CODE_PUNCTUATION. * @return the maximum variable reordering group. * @see setMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ virtual UColReorderCode getMaxVariable() const; diff --git a/icu4c/source/i18n/unicode/datefmt.h b/icu4c/source/i18n/unicode/datefmt.h index eb1454ae723..983f13635c5 100644 --- a/icu4c/source/i18n/unicode/datefmt.h +++ b/icu4c/source/i18n/unicode/datefmt.h @@ -1,6 +1,6 @@ /* ******************************************************************************** - * Copyright (C) 1997-2014, International Business Machines + * Copyright (C) 1997-2015, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************** * @@ -704,15 +704,13 @@ public: virtual void setLenient(UBool lenient); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Returns whether date/time parsing in the encapsulated Calendar object processing is lenient. - * @draft ICU 53 + * @stable ICU 53 */ virtual UBool isCalendarLenient(void) const; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Specifies whether encapsulated Calendar date/time parsing is to be lenient. With * lenient parsing, the parser may use heuristics to interpret inputs that @@ -720,7 +718,7 @@ public: * inputs must match this object's format more closely. * @param lenient when true, parsing is lenient * @see com.ibm.icu.util.Calendar#setLenient - * @draft ICU 53 + * @stable ICU 53 */ virtual void setCalendarLenient(UBool lenient); @@ -801,7 +799,6 @@ public: */ virtual void setTimeZone(const TimeZone& zone); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. @@ -809,11 +806,10 @@ public: * @param status Input/output status. If at entry this indicates a failure * status, the function will do nothing; otherwise this will be * updated with any new status from the function. - * @draft ICU 53 + * @stable ICU 53 */ virtual void setContext(UDisplayContext value, UErrorCode& status); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Get the formatter's UDisplayContext value for the specified UDisplayContextType, * such as UDISPCTX_TYPE_CAPITALIZATION. @@ -822,11 +818,10 @@ public: * status, the function will do nothing; otherwise this will be * updated with any new status from the function. * @return The UDisplayContextValue for the specified type. - * @draft ICU 53 + * @stable ICU 53 */ virtual UDisplayContext getContext(UDisplayContextType type, UErrorCode& status) const; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Sets an boolean attribute on this DateFormat. * May return U_UNSUPPORTED_ERROR if this instance does not support @@ -835,14 +830,13 @@ public: * @param newvalue new value * @param status the error type * @return *this - for chaining (example: format.setAttribute(...).setAttribute(...) ) - * @draft ICU 53 + * @stable ICU 53 */ virtual DateFormat& U_EXPORT2 setBooleanAttribute(UDateFormatBooleanAttribute attr, UBool newvalue, UErrorCode &status); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Returns a boolean from this DateFormat * May return U_UNSUPPORTED_ERROR if this instance does not support @@ -850,7 +844,7 @@ public: * @param attr the attribute to set * @param status the error type * @return the attribute value. Undefined if there is an error. - * @draft ICU 53 + * @stable ICU 53 */ virtual UBool U_EXPORT2 getBooleanAttribute(UDateFormatBooleanAttribute attr, UErrorCode &status) const; diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h index dd62a92e420..46ef22241b3 100644 --- a/icu4c/source/i18n/unicode/dcfmtsym.h +++ b/icu4c/source/i18n/unicode/dcfmtsym.h @@ -1,6 +1,6 @@ /* ******************************************************************************** -* Copyright (C) 1997-2014, International Business Machines +* Copyright (C) 1997-2015, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************** * @@ -163,12 +163,14 @@ public: * @stable ICU 4.6 */ kNineDigitSymbol, +#ifndef U_HIDE_DRAFT_API /** Multiplication sign. * @draft ICU 54 */ kExponentMultiplicationSymbol, +#endif /* U_HIDE_DRAFT_API */ /** count symbol constants */ - kFormatSymbolCount + kFormatSymbolCount = kNineDigitSymbol + 2 }; /** diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h index 75249a4bc43..138855bf085 100644 --- a/icu4c/source/i18n/unicode/decimfmt.h +++ b/icu4c/source/i18n/unicode/decimfmt.h @@ -1,6 +1,6 @@ /* ******************************************************************************** -* Copyright (C) 1997-2014, International Business Machines +* Copyright (C) 1997-2015, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************** * @@ -808,7 +808,7 @@ public: * Set whether or not grouping will be used in this format. * @param newValue True, grouping will be used in this format. * @see getGroupingUsed - * @draft ICU 53 + * @stable ICU 53 */ virtual void setGroupingUsed(UBool newValue); @@ -817,11 +817,10 @@ public: * @param value set True, this format will parse numbers as integers * only. * @see isParseIntegerOnly - * @draft ICU 53 + * @stable ICU 53 */ virtual void setParseIntegerOnly(UBool value); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. @@ -829,7 +828,7 @@ public: * @param status Input/output status. If at entry this indicates a failure * status, the function will do nothing; otherwise this will be * updated with any new status from the function. - * @draft ICU 53 + * @stable ICU 53 */ virtual void setContext(UDisplayContext value, UErrorCode& status); diff --git a/icu4c/source/i18n/unicode/dtfmtsym.h b/icu4c/source/i18n/unicode/dtfmtsym.h index a6e90a4c188..78d0ceb5a90 100644 --- a/icu4c/source/i18n/unicode/dtfmtsym.h +++ b/icu4c/source/i18n/unicode/dtfmtsym.h @@ -438,7 +438,9 @@ public: * @draft ICU 55 */ void setTimeSeparatorString(const UnicodeString& newTimeSeparator); +#endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API /** * Gets cyclic year name strings if the calendar has them, by width and context. * For example: "jia-zi", "yi-chou", etc. diff --git a/icu4c/source/i18n/unicode/measfmt.h b/icu4c/source/i18n/unicode/measfmt.h index f6f1a498317..61a1e86d9c4 100644 --- a/icu4c/source/i18n/unicode/measfmt.h +++ b/icu4c/source/i18n/unicode/measfmt.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2004-2014, International Business Machines +* Copyright (c) 2004-2015, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -29,45 +29,43 @@ * For example, for English, when formatting "3 hours" * Wide is "3 hours"; short is "3 hrs"; narrow is "3h"; * formatting "3 hours 17 minutes" as numeric give "3:17" - * @draft ICU 53 + * @stable ICU 53 */ enum UMeasureFormatWidth { -#ifndef U_HIDE_DRAFT_API // Wide, short, and narrow must be first and in this order. /** * Spell out measure units. - * @draft ICU 53 + * @stable ICU 53 */ UMEASFMT_WIDTH_WIDE, /** * Abbreviate measure units. - * @draft ICU 53 + * @stable ICU 53 */ UMEASFMT_WIDTH_SHORT, /** * Use symbols for measure units when possible. - * @draft ICU 53 + * @stable ICU 53 */ UMEASFMT_WIDTH_NARROW, /** * Completely omit measure units when possible. For example, format * '5 hours, 37 minutes' as '5:37' - * @draft ICU 53 + * @stable ICU 53 */ UMEASFMT_WIDTH_NUMERIC, -#endif /* U_HIDE_DRAFT_API */ /** * Count of values in this enum. - * @draft ICU 53 + * @stable ICU 53 */ UMEASFMT_WIDTH_COUNT = 4 }; -/** @draft ICU 53 */ +/** @stable ICU 53 */ typedef enum UMeasureFormatWidth UMeasureFormatWidth; U_NAMESPACE_BEGIN @@ -97,34 +95,32 @@ class U_I18N_API MeasureFormat : public Format { using Format::parseObject; using Format::format; -#ifndef U_HIDE_DRAFT_API /** * Constructor. - * @draft ICU 53 + * @stable ICU 53 */ MeasureFormat( const Locale &locale, UMeasureFormatWidth width, UErrorCode &status); /** * Constructor. - * @draft ICU 53 + * @stable ICU 53 */ MeasureFormat( const Locale &locale, UMeasureFormatWidth width, NumberFormat *nfToAdopt, UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ /** * Copy constructor. - * @draft ICU 53 + * @stable ICU 3.0 */ MeasureFormat(const MeasureFormat &other); /** * Assignment operator. - * @draft ICU 53 + * @stable ICU 3.0 */ MeasureFormat &operator=(const MeasureFormat &rhs); @@ -136,19 +132,19 @@ class U_I18N_API MeasureFormat : public Format { /** * Return true if given Format objects are semantically equal. - * @draft ICU 53 + * @stable ICU 53 */ virtual UBool operator==(const Format &other) const; /** * Clones this object polymorphically. - * @draft ICU 53 + * @stable ICU 53 */ virtual Format *clone() const; /** * Formats object to produce a string. - * @draft ICU 53 + * @stable ICU 53 */ virtual UnicodeString &format( const Formattable &obj, @@ -167,7 +163,6 @@ class U_I18N_API MeasureFormat : public Format { Formattable &reslt, ParsePosition &pos) const; -#ifndef U_HIDE_DRAFT_API /** * Formats measure objects to produce a string. An example of such a * formatted string is 3 meters, 3.5 centimeters. Measure objects appear @@ -182,7 +177,7 @@ class U_I18N_API MeasureFormat : public Format { * @param status the error. * @return appendTo reference * - * @draft ICU 53 + * @stable ICU 53 */ UnicodeString &formatMeasures( const Measure *measures, @@ -190,7 +185,6 @@ class U_I18N_API MeasureFormat : public Format { UnicodeString &appendTo, FieldPosition &pos, UErrorCode &status) const; -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -244,7 +238,7 @@ class U_I18N_API MeasureFormat : public Format { * . erived::getStaticClassID()) ... * * @return The class ID for all objects of this class. - * @draft ICU 53 + * @stable ICU 53 */ static UClassID U_EXPORT2 getStaticClassID(void); @@ -257,7 +251,7 @@ class U_I18N_API MeasureFormat : public Format { * @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. - * @draft ICU 53 + * @stable ICU 53 */ virtual UClassID getDynamicClassID(void) const; diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index 446b3ee992f..c7370667d31 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2004-2014, International Business Machines +* Copyright (c) 2004-2015, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -46,13 +46,13 @@ class U_I18N_API MeasureUnit: public UObject { /** * Copy constructor. - * @draft ICU 53 + * @stable ICU 3.0 */ MeasureUnit(const MeasureUnit &other); /** * Assignment operator. - * @draft ICU 53 + * @stable ICU 3.0 */ MeasureUnit &operator=(const MeasureUnit &other); @@ -76,11 +76,10 @@ class U_I18N_API MeasureUnit: public UObject { */ virtual UBool operator==(const UObject& other) const; -#ifndef U_HIDE_DRAFT_API /** * Inequality operator. Return true if this object is not equal * to the given object. - * @draft ICU 53 + * @stable ICU 53 */ UBool operator!=(const UObject& other) const { return !(*this == other); @@ -88,13 +87,13 @@ class U_I18N_API MeasureUnit: public UObject { /** * Get the type. - * @draft ICU 53 + * @stable ICU 53 */ const char *getType() const; /** * Get the sub type. - * @draft ICU 53 + * @stable ICU 53 */ const char *getSubtype() const; @@ -107,7 +106,7 @@ class U_I18N_API MeasureUnit: public UObject { * @param destCapacity number of MeasureUnit instances available at dest. * @param errorCode ICU error code. * @return number of available units. - * @draft ICU 53 + * @stable ICU 53 */ static int32_t getAvailable( MeasureUnit *destArray, @@ -124,7 +123,7 @@ class U_I18N_API MeasureUnit: public UObject { * @param destCapacity number of MeasureUnit instances available at dest. * @param errorCode ICU error code. * @return number of available units for type. - * @draft ICU 53 + * @stable ICU 53 */ static int32_t getAvailable( const char *type, @@ -138,10 +137,9 @@ class U_I18N_API MeasureUnit: public UObject { * * @param errorCode ICU error code. * @return the types. - * @draft ICU 53 + * @stable ICU 53 */ static StringEnumeration* getAvailableTypes(UErrorCode &errorCode); -#endif /* U_HIDE_DRAFT_API */ /** * Return the class ID for this class. This is useful only for comparing to @@ -152,7 +150,7 @@ class U_I18N_API MeasureUnit: public UObject { * . erived::getStaticClassID()) ... * * @return The class ID for all objects of this class. - * @draft ICU 53 + * @stable ICU 53 */ static UClassID U_EXPORT2 getStaticClassID(void); @@ -165,7 +163,7 @@ class U_I18N_API MeasureUnit: public UObject { * @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. - * @draft ICU 53 + * @stable ICU 53 */ virtual UClassID getDynamicClassID(void) const; @@ -201,16 +199,14 @@ class U_I18N_API MeasureUnit: public UObject { // // Start generated createXXX methods -#ifndef U_HIDE_DRAFT_API /** * Returns unit of acceleration: g-force. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createGForce(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of acceleration: meter-per-second-squared. @@ -221,36 +217,30 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createMeterPerSecondSquared(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of angle: arc-minute. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createArcMinute(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of angle: arc-second. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createArcSecond(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of angle: degree. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createDegree(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of angle: radian. @@ -261,26 +251,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createRadian(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: acre. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createAcre(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: hectare. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createHectare(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-centimeter. @@ -291,16 +277,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createSquareCentimeter(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-foot. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createSquareFoot(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-inch. @@ -311,36 +295,30 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createSquareInch(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-kilometer. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createSquareKilometer(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-meter. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createSquareMeter(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-mile. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createSquareMile(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of area: square-yard. @@ -471,26 +449,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createTerabyte(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: day. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createDay(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: hour. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createHour(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: microsecond. @@ -501,36 +475,30 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createMicrosecond(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: millisecond. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMillisecond(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: minute. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMinute(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: month. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMonth(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: nanosecond. @@ -541,36 +509,30 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createNanosecond(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: second. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createSecond(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: week. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createWeek(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of duration: year. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createYear(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of electric: ampere. @@ -721,16 +683,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createAstronomicalUnit(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: centimeter. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createCentimeter(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of length: decimeter. @@ -751,16 +711,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createFathom(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: foot. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createFoot(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of length: furlong. @@ -771,46 +729,38 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createFurlong(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: inch. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createInch(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: kilometer. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createKilometer(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: light-year. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createLightYear(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: meter. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMeter(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of length: micrometer. @@ -821,26 +771,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createMicrometer(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: mile. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMile(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: millimeter. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMillimeter(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of length: nanometer. @@ -871,26 +817,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createParsec(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: picometer. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createPicometer(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of length: yard. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createYard(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of light: lux. @@ -911,26 +853,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createCarat(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: gram. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createGram(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: kilogram. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createKilogram(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: metric-ton. @@ -961,16 +899,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createMilligram(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: ounce. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createOunce(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: ounce-troy. @@ -981,16 +917,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createOunceTroy(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: pound. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createPound(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of mass: stone. @@ -1021,26 +955,22 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createGigawatt(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of power: horsepower. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createHorsepower(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of power: kilowatt. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createKilowatt(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of power: megawatt. @@ -1061,46 +991,38 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createMilliwatt(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of power: watt. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createWatt(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of pressure: hectopascal. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createHectopascal(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of pressure: inch-hg. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createInchHg(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of pressure: millibar. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMillibar(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of pressure: millimeter-of-mercury. @@ -1131,56 +1053,46 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createKarat(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of speed: kilometer-per-hour. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createKilometerPerHour(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of speed: meter-per-second. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMeterPerSecond(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of speed: mile-per-hour. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createMilePerHour(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of temperature: celsius. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createCelsius(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of temperature: fahrenheit. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createFahrenheit(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of temperature: kelvin. @@ -1251,16 +1163,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createCubicInch(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: cubic-kilometer. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createCubicKilometer(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: cubic-meter. @@ -1271,16 +1181,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createCubicMeter(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: cubic-mile. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createCubicMile(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: cubic-yard. @@ -1341,16 +1249,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createHectoliter(UErrorCode &status); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: liter. * Caller owns returned value and must free it. * @param status ICU error code. - * @draft ICU 53 + * @stable ICU 53 */ static MeasureUnit *createLiter(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** * Returns unit of volume: megaliter. diff --git a/icu4c/source/i18n/unicode/measure.h b/icu4c/source/i18n/unicode/measure.h index 434ea880eda..c0f88bbdaa1 100644 --- a/icu4c/source/i18n/unicode/measure.h +++ b/icu4c/source/i18n/unicode/measure.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2004-2014, International Business Machines +* Copyright (c) 2004-2015, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -108,7 +108,7 @@ class U_I18N_API Measure: public UObject { * . erived::getStaticClassID()) ... * * @return The class ID for all objects of this class. - * @draft ICU 53 + * @stable ICU 53 */ static UClassID U_EXPORT2 getStaticClassID(void); @@ -121,7 +121,7 @@ class U_I18N_API Measure: public UObject { * @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. - * @draft ICU 53 + * @stable ICU 53 */ virtual UClassID getDynamicClassID(void) const; diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h index e7dc33ecadc..164c65769fe 100644 --- a/icu4c/source/i18n/unicode/numfmt.h +++ b/icu4c/source/i18n/unicode/numfmt.h @@ -1,6 +1,6 @@ /* ******************************************************************************** -* Copyright (C) 1997-2014, International Business Machines Corporation and others. +* Copyright (C) 1997-2015, International Business Machines Corporation and others. * All Rights Reserved. ******************************************************************************** * @@ -949,7 +949,6 @@ public: */ const UChar* getCurrency() const; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. @@ -957,11 +956,10 @@ public: * @param status Input/output status. If at entry this indicates a failure * status, the function will do nothing; otherwise this will be * updated with any new status from the function. - * @draft ICU 53 + * @stable ICU 53 */ virtual void setContext(UDisplayContext value, UErrorCode& status); - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Get the formatter's UDisplayContext value for the specified UDisplayContextType, * such as UDISPCTX_TYPE_CAPITALIZATION. @@ -970,7 +968,7 @@ public: * status, the function will do nothing; otherwise this will be * updated with any new status from the function. * @return The UDisplayContextValue for the specified type. - * @draft ICU 53 + * @stable ICU 53 */ virtual UDisplayContext getContext(UDisplayContextType type, UErrorCode& status) const; diff --git a/icu4c/source/i18n/unicode/rbnf.h b/icu4c/source/i18n/unicode/rbnf.h index 7c18f68d3d5..7058c9671cb 100644 --- a/icu4c/source/i18n/unicode/rbnf.h +++ b/icu4c/source/i18n/unicode/rbnf.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 1997-2014, International Business Machines Corporation and others. +* Copyright (C) 1997-2015, International Business Machines Corporation and others. * All Rights Reserved. ******************************************************************************* */ @@ -913,7 +913,6 @@ public: */ virtual UnicodeString getDefaultRuleSetName() const; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see @@ -922,7 +921,7 @@ public: * @param status Input/output status. If at entry this indicates a failure * status, the function will do nothing; otherwise this will be * updated with any new status from the function. - * @draft ICU 53 + * @stable ICU 53 */ virtual void setContext(UDisplayContext value, UErrorCode& status); diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h index 9c2ca59cb92..7b416cfcf6f 100644 --- a/icu4c/source/i18n/unicode/reldatefmt.h +++ b/icu4c/source/i18n/unicode/reldatefmt.h @@ -1,6 +1,6 @@ /* ***************************************************************************** -* Copyright (C) 2014, International Business Machines Corporation and +* Copyright (C) 2014-2015, International Business Machines Corporation and * others. * All Rights Reserved. ***************************************************************************** @@ -57,65 +57,67 @@ typedef enum UDateRelativeDateTimeFormatterStyle { UDAT_STYLE_COUNT } UDateRelativeDateTimeFormatterStyle; +#endif /* U_HIDE_DRAFT_API */ + /** * Represents the unit for formatting a relative date. e.g "in 5 days" * or "in 3 months" - * @draft ICU 53 + * @stable ICU 53 */ typedef enum UDateRelativeUnit { /** * Seconds - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_SECONDS, /** * Minutes - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_MINUTES, /** * Hours - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_HOURS, /** * Days - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_DAYS, /** * Weeks - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_WEEKS, /** * Months - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_MONTHS, /** * Years - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_YEARS, /** * Count of items in this enum. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_RELATIVE_UNIT_COUNT } UDateRelativeUnit; /** * Represents an absolute unit. - * @draft ICU 53 + * @stable ICU 53 */ typedef enum UDateAbsoluteUnit { @@ -123,79 +125,79 @@ typedef enum UDateAbsoluteUnit { // Saturday. /** * Sunday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_SUNDAY, /** * Monday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_MONDAY, /** * Tuesday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_TUESDAY, /** * Wednesday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_WEDNESDAY, /** * Thursday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_THURSDAY, /** * Friday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_FRIDAY, /** * Saturday - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_SATURDAY, /** * Day - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_DAY, /** * Week - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_WEEK, /** * Month - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_MONTH, /** * Year - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_YEAR, /** * Now - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_NOW, /** * Count of items in this enum. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_ABSOLUTE_UNIT_COUNT } UDateAbsoluteUnit; @@ -203,49 +205,49 @@ typedef enum UDateAbsoluteUnit { /** * Represents a direction for an absolute unit e.g "Next Tuesday" * or "Last Tuesday" - * @draft ICU 53 + * @stable ICU 53 */ typedef enum UDateDirection { /** * Two before. Not fully supported in every locale. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_LAST_2, /** * Last - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_LAST, /** * This - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_THIS, /** * Next - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_NEXT, /** * Two after. Not fully supported in every locale. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_NEXT_2, /** * Plain, which means the absence of a qualifier. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_PLAIN, /** * Count of items in this enum. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_DIRECTION_COUNT } UDateDirection; @@ -326,20 +328,20 @@ class UnicodeString; * * The RelativeDateTimeFormatter class is not intended for public subclassing. * - * @draft ICU 53 + * @stable ICU 53 */ class U_I18N_API RelativeDateTimeFormatter : public UObject { public: /** * Create RelativeDateTimeFormatter with default locale. - * @draft ICU 53 + * @stable ICU 53 */ RelativeDateTimeFormatter(UErrorCode& status); /** * Create RelativeDateTimeFormatter with given locale. - * @draft ICU 53 + * @stable ICU 53 */ RelativeDateTimeFormatter(const Locale& locale, UErrorCode& status); @@ -351,11 +353,12 @@ public: * It is an error for caller to delete this pointer or change its * contents after calling this constructor. * @status Any error is returned here. - * @draft ICU 53 + * @stable ICU 53 */ RelativeDateTimeFormatter( const Locale& locale, NumberFormat *nfToAdopt, UErrorCode& status); +#ifndef U_HIDE_DRAFT_API /** * Create RelativeDateTimeFormatter with given locale, NumberFormat, * and capitalization context. @@ -377,23 +380,24 @@ public: UDateRelativeDateTimeFormatterStyle style, UDisplayContext capitalizationContext, UErrorCode& status); +#endif /* U_HIDE_DRAFT_API */ /** * Copy constructor. - * @draft ICU 53 + * @stable ICU 53 */ RelativeDateTimeFormatter(const RelativeDateTimeFormatter& other); /** * Assignment operator. - * @draft ICU 53 + * @stable ICU 53 */ RelativeDateTimeFormatter& operator=( const RelativeDateTimeFormatter& other); /** * Destructor. - * @draft ICU 53 + * @stable ICU 53 */ virtual ~RelativeDateTimeFormatter(); @@ -410,7 +414,7 @@ public: * appended * @param status ICU error code returned here. * @return appendTo - * @draft ICU 53 + * @stable ICU 53 */ UnicodeString& format( double quantity, @@ -429,7 +433,7 @@ public: * no format string is available. * @param status ICU error code returned here. * @return appendTo - * @draft ICU 53 + * @stable ICU 53 */ UnicodeString& format( UDateDirection direction, @@ -447,7 +451,7 @@ public: * @param appendTo concatenated date and time appended here * @param status ICU error code returned here. * @return appendTo - * @draft ICU 53 + * @stable ICU 53 */ UnicodeString& combineDateAndTime( const UnicodeString& relativeDateString, @@ -458,10 +462,11 @@ public: /** * Returns the NumberFormat this object is using. * - * @draft ICU 53 + * @stable ICU 53 */ const NumberFormat& getNumberFormat() const; +#ifndef U_HIDE_DRAFT_API /** * Returns the capitalization context. * @@ -475,6 +480,8 @@ public: * @draft ICU 54 */ UDateRelativeDateTimeFormatterStyle getFormatStyle() const; +#endif /* U_HIDE_DRAFT_API */ + private: const RelativeDateTimeCacheData* fCache; const SharedNumberFormat *fNumberFormat; @@ -492,7 +499,5 @@ private: U_NAMESPACE_END -#endif /* U_HIDE_DRAFT_API */ - #endif /* !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION*/ #endif diff --git a/icu4c/source/i18n/unicode/smpdtfmt.h b/icu4c/source/i18n/unicode/smpdtfmt.h index ab22e3c011e..ccdaff42abb 100644 --- a/icu4c/source/i18n/unicode/smpdtfmt.h +++ b/icu4c/source/i18n/unicode/smpdtfmt.h @@ -1119,7 +1119,6 @@ public: */ virtual const TimeZoneFormat* getTimeZoneFormat(void) const; - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */ /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see @@ -1128,7 +1127,7 @@ public: * @param status Input/output status. If at entry this indicates a failure * status, the function will do nothing; otherwise this will be * updated with any new status from the function. - * @draft ICU 53 + * @stable ICU 53 */ virtual void setContext(UDisplayContext value, UErrorCode& status); diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h index 4dca5ec6821..e56f189ad2d 100644 --- a/icu4c/source/i18n/unicode/tblcoll.h +++ b/icu4c/source/i18n/unicode/tblcoll.h @@ -531,7 +531,7 @@ public: * function chaining. (See User Guide for details.) * @return *this * @see getMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ virtual Collator &setMaxVariable(UColReorderCode group, UErrorCode &errorCode); @@ -539,7 +539,7 @@ public: * Returns the maximum reordering group whose characters are affected by UCOL_ALTERNATE_HANDLING. * @return the maximum variable reordering group. * @see setMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ virtual UColReorderCode getMaxVariable() const; diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h index 77996631f8a..510ddc8c6bd 100644 --- a/icu4c/source/i18n/unicode/ucol.h +++ b/icu4c/source/i18n/unicode/ucol.h @@ -1200,8 +1200,6 @@ ucol_setAttribute(UCollator *coll, UColAttribute attr, UColAttributeValue value, U_STABLE UColAttributeValue U_EXPORT2 ucol_getAttribute(const UCollator *coll, UColAttribute attr, UErrorCode *status); -#ifndef U_HIDE_DRAFT_API - /** * Sets the variable top to the top of the specified reordering group. * The variable top determines the highest-sorting character @@ -1216,9 +1214,9 @@ ucol_getAttribute(const UCollator *coll, UColAttribute attr, UErrorCode *status) * immediately. Check for U_FAILURE() on output or use with * function chaining. (See User Guide for details.) * @see ucol_getMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT void U_EXPORT2 +U_STABLE void U_EXPORT2 ucol_setMaxVariable(UCollator *coll, UColReorderCode group, UErrorCode *pErrorCode); /** @@ -1226,13 +1224,11 @@ ucol_setMaxVariable(UCollator *coll, UColReorderCode group, UErrorCode *pErrorCo * @param coll the collator * @return the maximum variable reordering group. * @see ucol_setMaxVariable - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT UColReorderCode U_EXPORT2 +U_STABLE UColReorderCode U_EXPORT2 ucol_getMaxVariable(const UCollator *coll); -#endif /* U_HIDE_DRAFT_API */ - #ifndef U_HIDE_DEPRECATED_API /** * Sets the variable top to the primary weight of the specified string. diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h index 4cea93c649a..532613a0637 100644 --- a/icu4c/source/i18n/unicode/udat.h +++ b/icu4c/source/i18n/unicode/udat.h @@ -844,26 +844,24 @@ U_STABLE void U_EXPORT2 udat_close(UDateFormat* format); -/* Dont hide UDateFormatBooleanAttribute type with #ifndef U_HIDE_DRAFT_API, needed by virtual methods */ -/* Also don't hide UDAT_BOOLEAN_ATTRIBUTE_COUNT, needed by template class EnumSet */ /** * DateFormat boolean attributes * - * @draft ICU 53 + * @stable ICU 53 */ typedef enum UDateFormatBooleanAttribute { -#ifndef U_HIDE_DRAFT_API /** * indicates whether whitespace is allowed. Includes trailing dot tolerance. - * @draft ICU 53 + * @stable ICU 53 */ UDAT_PARSE_ALLOW_WHITESPACE = 0, /** * indicates tolerance of numeric data when String data may be assumed. eg: UDAT_YEAR_NAME_FIELD, * UDAT_STANDALONE_MONTH_FIELD, UDAT_DAY_OF_WEEK_FIELD - * @draft ICU 53 + * @stable ICU 53 */ UDAT_PARSE_ALLOW_NUMERIC = 1, +#ifndef U_HIDE_DRAFT_API /** * indicates tolerance of a partial literal match * @draft ICU 53 @@ -878,12 +876,11 @@ typedef enum UDateFormatBooleanAttribute { #endif /* U_HIDE_DRAFT_API */ /** * count boolean date format constants - * @draft ICU 53 + * @stable ICU 53 */ UDAT_BOOLEAN_ATTRIBUTE_COUNT = 4 } UDateFormatBooleanAttribute; -#ifndef U_HIDE_DRAFT_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. @@ -892,9 +889,9 @@ typedef enum UDateFormatBooleanAttribute { * @param attr The attribute to query; e.g. UDAT_PARSE_ALLOW_WHITESPACE. * @param status A pointer to an UErrorCode to receive any errors * @return The value of attr. - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT UBool U_EXPORT2 +U_STABLE UBool U_EXPORT2 udat_getBooleanAttribute(const UDateFormat* fmt, UDateFormatBooleanAttribute attr, UErrorCode* status); /** @@ -905,13 +902,11 @@ udat_getBooleanAttribute(const UDateFormat* fmt, UDateFormatBooleanAttribute att * @param attr The attribute to set; one of UDAT_PARSE_ALLOW_WHITESPACE or UDAT_PARSE_ALLOW_NUMERIC * @param newValue The new value of attr. * @param status A pointer to an UErrorCode to receive any errors - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT void U_EXPORT2 +U_STABLE void U_EXPORT2 udat_setBooleanAttribute(UDateFormat *fmt, UDateFormatBooleanAttribute attr, UBool newValue, UErrorCode* status); -#endif /* U_HIDE_DRAFT_API */ - #if U_SHOW_CPLUSPLUS_API @@ -1548,7 +1543,6 @@ udat_getLocaleByType(const UDateFormat *fmt, U_DRAFT void U_EXPORT2 udat_setContext(UDateFormat* fmt, UDisplayContext value, UErrorCode* status); -#ifndef U_HIDE_DRAFT_API /** * Get the formatter's UDisplayContext value for the specified UDisplayContextType, * such as UDISPCTX_TYPE_CAPITALIZATION. @@ -1556,13 +1550,11 @@ udat_setContext(UDateFormat* fmt, UDisplayContext value, UErrorCode* status); * @param type The UDisplayContextType whose value to return * @param status A pointer to an UErrorCode to receive any errors * @return The UDisplayContextValue for the specified type. - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT UDisplayContext U_EXPORT2 +U_STABLE UDisplayContext U_EXPORT2 udat_getContext(const UDateFormat* fmt, UDisplayContextType type, UErrorCode* status); -#endif /* U_HIDE_DRAFT_API */ - #ifndef U_HIDE_INTERNAL_API /** * Extract the date pattern from a UDateFormat set for relative date formatting. diff --git a/icu4c/source/i18n/unicode/ulocdata.h b/icu4c/source/i18n/unicode/ulocdata.h index 5e462060303..63495f681ce 100644 --- a/icu4c/source/i18n/unicode/ulocdata.h +++ b/icu4c/source/i18n/unicode/ulocdata.h @@ -1,7 +1,7 @@ /* ****************************************************************************** * * -* Copyright (C) 2003-2014, International Business Machines * +* Copyright (C) 2003-2015, International Business Machines * * Corporation and others. All Rights Reserved. * * * ****************************************************************************** @@ -188,7 +188,7 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type, UChar *re typedef enum UMeasurementSystem { UMS_SI, /**< Measurement system specified by SI otherwise known as Metric system. @stable ICU 2.8 */ UMS_US, /**< Measurement system followed in the United States of America. @stable ICU 2.8 */ - UMS_UK, /**< Mix of metric and imperial units used in Great Britain. @stable ICU 55 */ + UMS_UK, /**< Mix of metric and imperial units used in Great Britain. @stable ICU 55 */ UMS_LIMIT } UMeasurementSystem; diff --git a/icu4c/source/i18n/unicode/unum.h b/icu4c/source/i18n/unicode/unum.h index c382cc86f9e..478089ff104 100644 --- a/icu4c/source/i18n/unicode/unum.h +++ b/icu4c/source/i18n/unicode/unum.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 1997-2014, International Business Machines Corporation and others. +* Copyright (C) 1997-2015, International Business Machines Corporation and others. * All Rights Reserved. * Modification History: * @@ -202,13 +202,13 @@ typedef enum UNumberFormatStyle { * @stable ICU 4.8 */ UNUM_CURRENCY_PLURAL=11, -#ifndef U_HIDE_DRAFT_API /** * Currency format for accounting, e.g., "($3.00)" for * negative currency amount instead of "-$3.00" ({@link #UNUM_CURRENCY}). - * @draft ICU 53 + * @stable ICU 53 */ UNUM_CURRENCY_ACCOUNTING=12, +#ifndef U_HIDE_DRAFT_API /** * Currency format with a currency symbol given CASH usage, e.g., * "NT$3" instead of "NT$3.23". @@ -1297,16 +1297,15 @@ unum_getLocaleByType(const UNumberFormat *fmt, ULocDataLocaleType type, UErrorCode* status); -#ifndef U_HIDE_DRAFT_API /** * Set a particular UDisplayContext value in the formatter, such as * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. * @param fmt The formatter for which to set a UDisplayContext value. * @param value The UDisplayContext value to set. * @param status A pointer to an UErrorCode to receive any errors - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT void U_EXPORT2 +U_STABLE void U_EXPORT2 unum_setContext(UNumberFormat* fmt, UDisplayContext value, UErrorCode* status); /** @@ -1316,13 +1315,11 @@ unum_setContext(UNumberFormat* fmt, UDisplayContext value, UErrorCode* status); * @param type The UDisplayContextType whose value to return * @param status A pointer to an UErrorCode to receive any errors * @return The UDisplayContextValue for the specified type. - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT UDisplayContext U_EXPORT2 +U_STABLE UDisplayContext U_EXPORT2 unum_getContext(const UNumberFormat *fmt, UDisplayContextType type, UErrorCode* status); -#endif /* U_HIDE_DRAFT_API */ - #endif /* #if !UCONFIG_NO_FORMATTING */ #endif diff --git a/icu4c/source/i18n/unicode/uregex.h b/icu4c/source/i18n/unicode/uregex.h index be32ed94a0d..b1b5d65d150 100644 --- a/icu4c/source/i18n/unicode/uregex.h +++ b/icu4c/source/i18n/unicode/uregex.h @@ -607,6 +607,7 @@ U_STABLE int32_t U_EXPORT2 uregex_groupCount(URegularExpression *regexp, UErrorCode *status); +#ifndef U_HIDE_DRAFT_API /** * Get the group number corresponding to a named capture group. * The returned number can be used with any function that access @@ -652,7 +653,7 @@ uregex_groupNumberFromCName(URegularExpression *regexp, const char *groupName, int32_t nameLength, UErrorCode *status); - +#endif /* U_HIDE_DRAFT_API */ /** Extract the string for the specified matching expression or subexpression. * Group #0 is the complete string of matched text. diff --git a/icu4c/source/i18n/unicode/uspoof.h b/icu4c/source/i18n/unicode/uspoof.h index f921b3c50ea..8d665e1b3ed 100644 --- a/icu4c/source/i18n/unicode/uspoof.h +++ b/icu4c/source/i18n/unicode/uspoof.h @@ -278,14 +278,12 @@ typedef enum USpoofChecks { * @stable ICU 51 */ USPOOF_ASCII = 0x10000000, -#ifndef U_HIDE_DRAFT_API /** * All characters in each identifier must be from a single script. * - * @draft ICU 53 + * @stable ICU 53 */ USPOOF_SINGLE_SCRIPT_RESTRICTIVE = 0x20000000, -#endif /* U_HIDE_DRAFT_API */ /** * All characters in each identifier must be from a single script, or from the combinations: Latin + Han + * Hiragana + Katakana; Latin + Han + Bopomofo; or Latin + Han + Hangul. Note that this level will satisfy the @@ -312,14 +310,12 @@ typedef enum USpoofChecks { * @stable ICU 51 */ USPOOF_UNRESTRICTIVE = 0x60000000, -#ifndef U_HIDE_DRAFT_API /** * Mask for selecting the Restriction Level bits from the return value of uspoof_check(). * - * @draft ICU 53 + * @stable ICU 53 */ USPOOF_RESTRICTION_LEVEL_MASK = 0x7F000000 -#endif /* U_HIDE_DRAFT_API */ } URestrictionLevel; /** diff --git a/icu4c/source/i18n/unicode/utrans.h b/icu4c/source/i18n/unicode/utrans.h index c6f67da0342..e3fe1629c8c 100644 --- a/icu4c/source/i18n/unicode/utrans.h +++ b/icu4c/source/i18n/unicode/utrans.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 1997-2011,2014 International Business Machines +* Copyright (C) 1997-2011,2014-2015 International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * Date Name Description @@ -509,7 +509,6 @@ utrans_transIncrementalUChars(const UTransliterator* trans, UTransPosition* pos, UErrorCode* status); -#ifndef U_HIDE_DRAFT_API /** * Create a rule string that can be passed to utrans_openU to recreate this * transliterator. @@ -525,9 +524,9 @@ utrans_transIncrementalUChars(const UTransliterator* trans, * contents of result are undefined. * @return int32_t The length of the rule string (may be greater than resultLength, * in which case an error is returned). - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT int32_t U_EXPORT2 +U_STABLE int32_t U_EXPORT2 utrans_toRules( const UTransliterator* trans, UBool escapeUnprintable, UChar* result, int32_t resultLength, @@ -550,14 +549,13 @@ utrans_toRules( const UTransliterator* trans, * @return USet* Either fillIn, or if fillIn is NULL, a pointer to a * newly-allocated USet that the user must close. In case of * error, NULL is returned. - * @draft ICU 53 + * @stable ICU 53 */ -U_DRAFT USet* U_EXPORT2 +U_STABLE USet* U_EXPORT2 utrans_getSourceSet(const UTransliterator* trans, UBool ignoreFilter, USet* fillIn, UErrorCode* status); -#endif /* U_HIDE_DRAFT_API */ /* deprecated API ----------------------------------------------------------- */