organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-9721 Update "#ifndef U_HIDE_XXX_API" guards for API status

Browse source 
X-SVN-Rev: 33367
This commit is contained in:
Peter Edberg 2013-03-05 01:38:48 +00:00
parent caed1f5d69
commit fbace77746
36 changed files with 152 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/unicode/dbbi.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2006 IBM Corp. All rights reserved.
* Copyright (C) 1999-2006,2013 IBM Corp. All rights reserved.
**********************************************************************
* Date Name Description
* 12/1/99 rgillam Complete port from Java.
@ -22,17 +22,15 @@
U_NAMESPACE_BEGIN
#ifndef U_HIDE_DEPRECATED_API
/**
* 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.
*/
#ifndef U_HIDE_DEPRECATED_API
typedef RuleBasedBreakIterator DictionaryBasedBreakIterator;
#endif
#endif /* U_HIDE_DEPRECATED_API */
U_NAMESPACE_END

9
icu4c/source/common/unicode/listformatter.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2012, International Business Machines
* Copyright (C) 2012-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -17,10 +17,13 @@
#ifndef __LISTFORMATTER_H__
#define __LISTFORMATTER_H__
#include "unicode/utypes.h"
#ifndef U_HIDE_DRAFT_API
#include "unicode/unistr.h"
#include "unicode/locid.h"
U_NAMESPACE_BEGIN
/** @internal */
@ -52,6 +55,7 @@ struct ListFormatData : public UMemory {
* as "Alice, Bob, Charlie and Delta" in English.
*
* The ListFormatter class is not intended for public subclassing.
* @draft ICU 50
*/
class U_COMMON_API ListFormatter : public UObject{
@ -120,4 +124,5 @@ class U_COMMON_API ListFormatter : public UObject{
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif

6
icu4c/source/common/unicode/messagepattern.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2011-2012, International Business Machines
* Copyright (C) 2011-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: messagepattern.h
@ -247,18 +247,21 @@ enum UMessagePatternArgType {
* @stable ICU 4.8
*/
UMSGPAT_ARG_TYPE_SELECT,
#ifndef U_HIDE_DRAFT_API
/**
* The argument is an ordinal-number PluralFormat
* with the same style parts sequence and semantics as UMSGPAT_ARG_TYPE_PLURAL.
* @draft ICU 50
*/
UMSGPAT_ARG_TYPE_SELECTORDINAL
#endif /* U_HIDE_DRAFT_API */
};
/**
* @stable ICU 4.8
*/
typedef enum UMessagePatternArgType UMessagePatternArgType;
#ifndef U_HIDE_DRAFT_API
/**
* Returns TRUE if the argument type has a plural style part sequence and semantics,
* for example UMSGPAT_ARG_TYPE_PLURAL and UMSGPAT_ARG_TYPE_SELECTORDINAL.
@ -266,6 +269,7 @@ typedef enum UMessagePatternArgType UMessagePatternArgType;
*/
#define UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType) \
((argType)==UMSGPAT_ARG_TYPE_PLURAL || (argType)==UMSGPAT_ARG_TYPE_SELECTORDINAL)
#endif /* U_HIDE_DRAFT_API */
enum {
/**

8
icu4c/source/common/unicode/uchar.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -1457,14 +1457,16 @@ typedef enum UEastAsianWidth {
typedef enum UCharNameChoice {
/** Unicode character name (Name property). @stable ICU 2.0 */
U_UNICODE_CHAR_NAME,
#ifndef U_HIDE_DEPRECATED_API
/**
* The Unicode_1_Name property value which is of little practical value.
* Beginning with ICU 49, ICU APIs return an empty string for this name choice.
* @deprecated ICU 49
*/
U_UNICODE_10_CHAR_NAME,
#endif /* U_HIDE_DEPRECATED_API */
/** Standard or synthetic character name. @stable ICU 2.0 */
U_EXTENDED_CHAR_NAME,
U_EXTENDED_CHAR_NAME = U_UNICODE_CHAR_NAME+2,
/** Corrected name from NameAliases.txt. @stable ICU 4.4 */
U_CHAR_NAME_ALIAS,
/** @stable ICU 2.0 */
@ -2655,6 +2657,7 @@ u_charName(UChar32 code, UCharNameChoice nameChoice,
char *buffer, int32_t bufferLength,
UErrorCode *pErrorCode);
#ifndef U_HIDE_DEPRECATED_API
/**
* Returns an empty string.
* Used to return the ISO 10646 comment for a character.
@ -2677,6 +2680,7 @@ U_STABLE int32_t U_EXPORT2
u_getISOComment(UChar32 c,
char *dest, int32_t destCapacity,
UErrorCode *pErrorCode);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Find a Unicode character by its name and return its code point value.

2
icu4c/source/common/unicode/unistr.h
View file

@ -54,6 +54,7 @@ U_STABLE int32_t U_EXPORT2
u_strlen(const UChar *s);
#endif
#ifndef U_HIDE_INTERNAL_API
/**
* \def U_STRING_CASE_MAPPER_DEFINED
* @internal
@ -73,6 +74,7 @@ UStringCaseMapper(const UCaseMap *csm,
UErrorCode *pErrorCode);
#endif
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_BEGIN

8
icu4c/source/common/unicode/utf8.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1999-2012, International Business Machines
* Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -253,6 +253,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
U8_NEXT(s, _u8_get_index, length, c); \
}
#ifndef U_HIDE_DRAFT_API
/**
* Get a code point from a string at a random-access offset,
* without changing the offset.
@ -283,6 +284,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
U8_SET_CP_START(s, start, _u8_get_index); \
U8_NEXT_OR_FFFD(s, _u8_get_index, length, c); \
}
#endif /* U_HIDE_DRAFT_API */
/* definitions with forward iteration --------------------------------------- */
@ -366,6 +368,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
} \
}
#ifndef U_HIDE_DRAFT_API
/**
* Get a code point from a string at a code point boundary offset,
* and advance the offset to the next code point boundary.
@ -416,6 +419,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
} \
} \
}
#endif /* U_HIDE_DRAFT_API */
/**
* Append a code point to a string, overwriting 1 to 4 bytes.
@ -672,6 +676,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
} \
}
#ifndef U_HIDE_DRAFT_API
/**
* Move the string offset from one code point boundary to the previous one
* and get the code point between them.
@ -702,6 +707,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
(c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -3); \
} \
}
#endif /* U_HIDE_DRAFT_API */
/**
* Move the string offset from one code point boundary to the previous one.

2
icu4c/source/i18n/unicode/calendar.h
View file

@ -1605,11 +1605,13 @@ protected:
* @internal
*/
enum ELimitType {
#ifndef U_HIDE_INTERNAL_API
UCAL_LIMIT_MINIMUM = 0,
UCAL_LIMIT_GREATEST_MINIMUM,
UCAL_LIMIT_LEAST_MAXIMUM,
UCAL_LIMIT_MAXIMUM,
UCAL_LIMIT_COUNT
#endif /* U_HIDE_INTERNAL_API */
};
/**

7
icu4c/source/i18n/unicode/compactdecimalformat.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2012, International Business Machines
* Copyright (C) 2012-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -18,6 +18,7 @@
*/
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/decimfmt.h"
@ -47,6 +48,7 @@ class PluralRules;
* Resetting the pattern prefixes or suffixes is not supported; the method calls
* are ignored.
* <p>
* @draft ICU 51
*/
class U_I18N_API CompactDecimalFormat : public DecimalFormat {
public:
@ -260,7 +262,7 @@ public:
Formattable& result,
UErrorCode& status) const;
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/* Cannot use #ifndef U_HIDE_INTERNAL_API for the following draft method since it is virtual */
/**
* Parses text from the given string as a currency amount. Unlike
* the parse() method, this method will attempt to parse a generic
@ -324,6 +326,7 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif // __COMPACT_DECIMAL_FORMAT_H__

6
icu4c/source/i18n/unicode/dcfmtsym.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -401,7 +401,6 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {
return *strPtr;
}
#ifndef U_HIDE_INTERNAL_API
inline const UnicodeString &
DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
const UnicodeString *strPtr;
@ -412,7 +411,6 @@ DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
}
return *strPtr;
}
#endif
// -------------------------------------
@ -443,12 +441,10 @@ DecimalFormatSymbols::getLocale() const {
return locale;
}
#ifndef U_HIDE_INTERNAL_API
inline const UChar*
DecimalFormatSymbols::getCurrencyPattern() const {
return currPattern;
}
#endif
U_NAMESPACE_END

10
icu4c/source/i18n/unicode/decimfmt.h
View file

@ -41,6 +41,7 @@
#include "unicode/curramt.h"
#include "unicode/enumset.h"
#ifndef U_HIDE_INTERNAL_API
/**
* \def UNUM_DECIMALFORMAT_INTERNAL_SIZE
* @internal
@ -48,6 +49,7 @@
#if UCONFIG_FORMAT_FASTPATHS_49
#define UNUM_DECIMALFORMAT_INTERNAL_SIZE 16
#endif
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_BEGIN
@ -758,7 +760,7 @@ public:
* @param style style of decimal format
* @param status Output param set to success/failure code. If the
* pattern is invalid this will be set to a failure code.
* @internal ICU 4.2
* @internal
*/
DecimalFormat( const UnicodeString& pattern,
DecimalFormatSymbols* symbolsToAdopt,
@ -1211,7 +1213,6 @@ public:
Formattable& result,
UErrorCode& status) const;
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Parses text from the given string as a currency amount. Unlike
* the parse() method, this method will attempt to parse a generic
@ -2381,11 +2382,13 @@ private:
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* Rounds a value according to the rules of this object.
* @internal
*/
DigitList& _round(const DigitList& number, DigitList& adjustedNum, UBool& isNegative, UErrorCode& status) const;
#endif /* U_HIDE_INTERNAL_API */
/**
* Returns the currency in effect for this formatter. Subclasses
@ -2457,14 +2460,11 @@ DecimalFormat::format(int32_t number,
return format((int64_t)number, appendTo, pos);
}
#ifndef U_HIDE_INTERNAL_API
inline const UnicodeString &
DecimalFormat::getConstSymbol(DecimalFormatSymbols::ENumberFormatSymbol symbol) const {
return fSymbols->getConstSymbol(symbol);
}
#endif
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */

7
icu4c/source/i18n/unicode/dtfmtsym.h
View file

@ -283,14 +283,16 @@ public:
ABBREVIATED,
WIDE,
NARROW,
#ifndef U_HIDE_DRAFT_API
/**
* Short width is currently only supported for weekday names.
* @draft ICU 51
*/
SHORT,
#endif /* U_HIDE_DRAFT_API */
/**
*/
DT_WIDTH_COUNT
DT_WIDTH_COUNT = 4
};
/**
@ -740,15 +742,12 @@ private:
*/
UnicodeString fLocalPatternChars;
#ifndef U_HIDE_INTERNAL_API
/**
* Capitalization transforms. For each usage type, the first array element indicates
* whether to titlecase for uiListOrMenu context, the second indicates whether to
* titlecase for stand-alone context.
*/
UBool fCapitalization[kCapContextUsageTypeCount][2];
#endif
private:
/** valid/actual locale information

6
icu4c/source/i18n/unicode/fmtable.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -31,6 +31,7 @@ U_NAMESPACE_BEGIN
class CharString;
class DigitList;
#ifndef U_HIDE_INTERNAL_API
/**
* \def UNUM_INTERNAL_STACKARRAY_SIZE
* @internal
@ -40,6 +41,7 @@ class DigitList;
#else
#define UNUM_INTERNAL_STACKARRAY_SIZE 128
#endif
#endif /* U_HIDE_INTERNAL_API */
/**
* Formattable objects can be passed to the Format class or
@ -683,11 +685,9 @@ inline UnicodeString& Formattable::getString(void) {
return *fValue.fString;
}
#ifndef U_HIDE_DEPRECATED_API
inline int32_t Formattable::getLong(UErrorCode* status) const {
return getLong(*status);
}
#endif
U_NAMESPACE_END

5
icu4c/source/i18n/unicode/gender.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2008-2012, International Business Machines Corporation and
* Copyright (C) 2008-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -19,6 +19,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/locid.h"
#include "unicode/ugender.h"
@ -69,7 +70,6 @@ public:
* Destructor.
*
* @draft ICU 50
* @internal
*/
virtual ~GenderInfo();
@ -101,6 +101,7 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif // _GENDER

1
icu4c/source/i18n/unicode/gregocal.h
View file

@ -468,7 +468,6 @@ public:
*/
static UClassID U_EXPORT2 getStaticClassID(void);
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Returns the calendar type name string for this Calendar object.
* The returned string is the legacy ICU calendar attribute value,

3
icu4c/source/i18n/unicode/numfmt.h
View file

@ -623,7 +623,6 @@ public:
Formattable& result,
UErrorCode& status) const;
/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Parses text from the given string as a currency amount. Unlike
* the parse() method, this method will attempt to parse a generic
@ -986,6 +985,7 @@ protected:
*/
virtual void getEffectiveCurrency(UChar* result, UErrorCode& ec) const;
#ifndef U_HIDE_INTERNAL_API
/**
* Creates the specified number format style of the desired locale.
* If mustBeDecimalFormat is TRUE, then the returned pointer is
@ -996,6 +996,7 @@ protected:
UNumberFormatStyle style,
UBool mustBeDecimalFormat,
UErrorCode& errorCode);
#endif /* U_HIDE_INTERNAL_API */
private:

5
icu4c/source/i18n/unicode/numsys.h
View file

@ -16,14 +16,17 @@
#ifndef NUMSYS
#define NUMSYS
#include "unicode/utypes.h"
#ifndef U_HIDE_INTERNAL_API
/**
* \def NUMSYS_NAME_CAPACITY
* Size of a numbering system name.
* @internal
*/
#define NUMSYS_NAME_CAPACITY 8
#endif /* U_HIDE_INTERNAL_API */
#include "unicode/utypes.h"
/**
* \file

8
icu4c/source/i18n/unicode/plurfmt.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2007-2012, International Business Machines Corporation and
* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -192,6 +192,7 @@ public:
*/
PluralFormat(const Locale& locale, const PluralRules& rules, UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Creates a new <code>PluralFormat</code> for the plural type.
* The standard number formatting will be done using the given locale.
@ -203,6 +204,7 @@ public:
* @draft ICU 50
*/
PluralFormat(const Locale& locale, UPluralType type, UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Creates a new cardinal-number <code>PluralFormat</code> for a given pattern string.
@ -266,6 +268,7 @@ public:
const UnicodeString& pattern,
UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Creates a new <code>PluralFormat</code> for a plural type, a
* pattern and a locale.
@ -283,6 +286,7 @@ public:
UPluralType type,
const UnicodeString& pattern,
UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* copy constructor.
@ -383,6 +387,7 @@ public:
FieldPosition& pos,
UErrorCode& status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Sets the locale used by this <code>PluraFormat</code> object.
* Note: Calling this method resets this <code>PluraFormat</code> object,
@ -399,6 +404,7 @@ public:
* use one of the constructors to create a new instance instead.
*/
void setLocale(const Locale& locale, UErrorCode& status);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets the number format used by this formatter. You only need to

4
icu4c/source/i18n/unicode/plurrule.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2008-2012, International Business Machines Corporation and
* Copyright (C) 2008-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -201,6 +201,7 @@ public:
*/
static PluralRules* U_EXPORT2 forLocale(const Locale& locale, UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Provides access to the predefined <code>PluralRules</code> for a given
* locale and the plural type.
@ -218,6 +219,7 @@ public:
* @draft ICU 50
*/
static PluralRules* U_EXPORT2 forLocale(const Locale& locale, UPluralType type, UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Given a number, returns the keyword of the first rule that applies to

4
icu4c/source/i18n/unicode/regex.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2012, International Business Machines
* Copyright (C) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: regex.h
@ -68,6 +68,7 @@ class UVector;
class UVector32;
class UVector64;
#ifndef U_HIDE_INTERNAL_API
/**
* RBBIPatternDump Debug function, displays the compiled form of a pattern.
* @internal
@ -79,6 +80,7 @@ U_INTERNAL void U_EXPORT2
#undef RegexPatternDump
#define RegexPatternDump(pat)
#endif
#endif /* U_HIDE_INTERNAL_API */

3
icu4c/source/i18n/unicode/region.h
View file

@ -258,7 +258,6 @@ private:
UVector *containedRegions;
UVector *preferredValues;
#ifndef U_HIDE_INTERNAL_API
/**
* Default Constructor. Internal - use factory methods only.
*
@ -279,8 +278,6 @@ private:
static void loadRegionData();
#endif /* U_HIDE_INTERNAL_API */
};
U_NAMESPACE_END

6
icu4c/source/i18n/unicode/sortkey.h
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************
* Copyright (C) 1996-2012, International Business Machines Corporation and others.
* Copyright (C) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*****************************************************************************
*
@ -29,7 +29,6 @@
*/
#if !UCONFIG_NO_COLLATION
#ifndef U_HIDE_DEPRECATED_API
#include "unicode/uobject.h"
#include "unicode/unistr.h"
@ -182,6 +181,7 @@ public:
uint8_t* toByteArray(int32_t& count) const;
#endif
#ifndef U_HIDE_DEPRECATED_API
/**
* Convenience method which does a string(bit-wise) comparison of the
* two collation keys.
@ -192,6 +192,7 @@ public:
* @deprecated ICU 2.6 use the overload with error code
*/
Collator::EComparisonResult compareTo(const CollationKey& target) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Convenience method which does a string(bit-wise) comparison of the
@ -331,7 +332,6 @@ CollationKey::getByteArray(int32_t &count) const
U_NAMESPACE_END
#endif /* U_HIDE_DEPRECATED_API */
#endif /* #if !UCONFIG_NO_COLLATION */
#endif

6
icu4c/source/i18n/unicode/tblcoll.h
View file

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1996-2012, International Business Machines Corporation and
* Copyright (C) 1996-2013, International Business Machines Corporation and
* others. All Rights Reserved.
******************************************************************************
*/
@ -394,6 +394,7 @@ public:
*/
virtual void getVersion(UVersionInfo info) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Returns the maximum length of any expansion sequences that end with the
* specified comparison order.
@ -411,6 +412,7 @@ public:
* @deprecated ICU 51 Use CollationElementIterator::getMaxExpansion() instead.
*/
int32_t getMaxExpansion(int32_t order) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. This
@ -841,12 +843,10 @@ inline void RuleBasedCollator::setUCollator(UCollator *collator)
setRuleStringFromCollator();
}
#ifndef U_HIDE_INTERNAL_API
inline const UCollator * RuleBasedCollator::getUCollator()
{
return ucollator;
}
#endif
U_NAMESPACE_END

4
icu4c/source/i18n/unicode/translit.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2012, International Business Machines
* Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -1308,7 +1308,6 @@ inline void Transliterator::setID(const UnicodeString& id) {
ID.truncate(ID.length()-1);
}
#ifndef U_HIDE_INTERNAL_API
inline Transliterator::Token Transliterator::integerToken(int32_t i) {
Token t;
t.integer = i;
@ -1320,7 +1319,6 @@ inline Transliterator::Token Transliterator::pointerToken(void* p) {
t.pointer = p;
return t;
}
#endif
U_NAMESPACE_END

18
icu4c/source/i18n/unicode/tzfmt.h
View file

@ -15,7 +15,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_INTERNAL_API
#ifndef U_HIDE_DRAFT_API
#include "unicode/format.h"
#include "unicode/timezone.h"
@ -58,6 +58,7 @@ typedef enum UTimeZoneFormatStyle {
* @draft ICU 50
*/
UTZFMT_STYLE_LOCALIZED_GMT,
#ifndef U_HIDE_DRAFT_API
/**
* Short localized GMT offset format, such as "GMT-5", "UTC+1:30"
* This style is equivalent to the LDML date format pattern "O".
@ -149,6 +150,7 @@ typedef enum UTimeZoneFormatStyle {
* @draft ICU 51
*/
UTZFMT_STYLE_EXEMPLAR_LOCATION
#endif /* U_HIDE_DRAFT_API */
} UTimeZoneFormatStyle;
/**
@ -176,6 +178,7 @@ typedef enum UTimeZoneFormatGMTOffsetPatternType {
* @draft ICU 50
*/
UTZFMT_PAT_NEGATIVE_HMS,
#ifndef U_HIDE_DRAFT_API
/**
* Positive offset with hours field
* @draft ICU 51
@ -186,12 +189,15 @@ typedef enum UTimeZoneFormatGMTOffsetPatternType {
* @draft ICU 51
*/
UTZFMT_PAT_NEGATIVE_H,
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_INTERNAL_API
/**
* Number of UTimeZoneFormatGMTOffsetPatternType types.
* @internal
*/
UTZFMT_PAT_COUNT
#endif /* U_HIDE_INTERNAL_API */
} UTimeZoneFormatGMTOffsetPatternType;
/**
@ -430,6 +436,7 @@ public:
*/
void setDefaultParseOptions(uint32_t flags);
#ifndef U_HIDE_DRAFT_API
/**
* Returns the ISO 8601 basic time zone string for the given offset.
* For example, "-08", "-0830" and "Z"
@ -465,6 +472,7 @@ public:
*/
UnicodeString& formatOffsetISO8601Extended(int32_t offset, UBool useUtcIndicator, UBool isShort, UBool ignoreSeconds,
UnicodeString& result, UErrorCode& status) const;
#endif /* U_HIDE_DRAFT_API */
/**
* Returns the localized GMT(UTC) offset format for the given offset.
@ -487,6 +495,7 @@ public:
*/
UnicodeString& formatOffsetLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const;
#ifndef U_HIDE_DRAFT_API
/**
* Returns the short localized GMT(UTC) offset format for the given offset.
* The short localized GMT offset is defined by;
@ -507,6 +516,7 @@ public:
* @draft ICU 51
*/
UnicodeString& formatOffsetShortLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const;
#endif /* U_HIDE_DRAFT_API */
using Format::format;
@ -556,6 +566,7 @@ public:
*/
int32_t parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const;
#ifndef U_HIDE_DRAFT_API
/**
* Returns offset from GMT(UTC) in milliseconds for the given short localized GMT
* offset format string. When the given string cannot be parsed, this method
@ -569,6 +580,7 @@ public:
* @draft ICU 51
*/
int32_t parseOffsetShortLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const;
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a <code>TimeZone</code> by parsing the time zone string according to
@ -1072,7 +1084,7 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_INTERNAL_API */
#endif
#endif /* ndef U_HIDE_DRAFT_API */
#endif /* !UCONFIG_NO_FORMATTING */
#endif

8
icu4c/source/i18n/unicode/tznames.h
View file

@ -14,7 +14,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_INTERNAL_API
#ifndef U_HIDE_DRAFT_API
#include "unicode/uloc.h"
#include "unicode/unistr.h"
@ -61,11 +61,13 @@ typedef enum UTimeZoneNameType {
* @draft ICU 50
*/
UTZNM_SHORT_DAYLIGHT = 0x20,
#ifndef U_HIDE_DRAFT_API
/**
* Exemplar location name, such as "Los Angeles".
* @draft ICU 51
*/
UTZNM_EXEMPLAR_LOCATION = 0x40
#endif /* U_HIDE_DRAFT_API */
} UTimeZoneNameType;
U_CDECL_END
@ -295,6 +297,7 @@ public:
*/
virtual ~MatchInfoCollection();
#ifndef U_HIDE_INTERNAL_API
/**
* Adds a zone match.
* @param nameType The name type.
@ -360,6 +363,7 @@ public:
* @internal
*/
UBool getMetaZoneIDAt(int32_t idx, UnicodeString& mzID) const;
#endif /* U_HIDE_INTERNAL_API */
private:
UVector* fMatches; // vector of MatchEntry
@ -385,6 +389,6 @@ public:
U_NAMESPACE_END
#endif /* U_HIDE_INTERNAL_API */
#endif /* U_HIDE_DRAFT_API */
#endif
#endif

2
icu4c/source/i18n/unicode/ucal.h
View file

@ -745,6 +745,7 @@ ucal_setTimeZone(UCalendar* cal,
int32_t len,
UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Get the ID of the UCalendar's time zone.
*
@ -760,6 +761,7 @@ ucal_getTimeZoneID(const UCalendar *cal,
UChar *result,
int32_t resultLength,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Possible formats for a UCalendar's display name

4
icu4c/source/i18n/unicode/ucol.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (c) 1996-2012, International Business Machines Corporation and others.
* Copyright (c) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*******************************************************************************
*/
@ -533,6 +533,7 @@ ucol_strcoll( const UCollator *coll,
const UChar *target,
int32_t targetLength);
#ifndef U_HIDE_DRAFT_API
/**
* Compare two strings in UTF-8.
* The strings will be compared using the options already specified.
@ -559,6 +560,7 @@ ucol_strcollUTF8(
const char *target,
int32_t targetLength,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Determine if one string is greater than another.

4
icu4c/source/i18n/unicode/udat.h
View file

@ -445,6 +445,7 @@ typedef enum UDateFormatStyle {
// deprecated skeleton constants
#ifndef U_HIDE_DEPRECATED_API
/**
* Constant for date skeleton with standalone month.
* @deprecated ICU 50 Use UDAT_MONTH instead.
@ -476,6 +477,7 @@ typedef enum UDateFormatStyle {
* @deprecated ICU 50 Use instead UDAT_HOUR UDAT_ABBR_SPECIFIC_TZ or some other timezone presentation.
*/
#define UDAT_HOUR_TZ "jz"
#endif /* U_HIDE_DEPRECATED_API */
/**
* FieldPosition and UFieldPosition selectors for format fields
@ -1333,7 +1335,6 @@ udat_applyPatternRelative(UDateFormat *format,
const UChar *timePattern,
int32_t timePatternLength,
UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
/**
* @internal
@ -1361,6 +1362,7 @@ udat_registerOpener(UDateFormatOpener opener, UErrorCode *status);
*/
U_INTERNAL UDateFormatOpener U_EXPORT2
udat_unregisterOpener(UDateFormatOpener opener, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif /* #if !UCONFIG_NO_FORMATTING */

6
icu4c/source/i18n/unicode/udisplaycontext.h
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 2012, International Business Machines
* Copyright (C) 2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -19,6 +19,7 @@
* @draft ICU 51
*/
enum UDisplayContextType {
#ifndef U_HIDE_DRAFT_API
/**
* Type to retrieve the dialect handling setting, e.g.
* UDISPCTX_STANDARD_NAMES or UDISPCTX_DIALECT_NAMES.
@ -32,6 +33,7 @@ enum UDisplayContextType {
* @draft ICU 51
*/
UDISPCTX_TYPE_CAPITALIZATION = 1
#endif /* U_HIDE_DRAFT_API */
};
/**
* @draft ICU 51
@ -45,6 +47,7 @@ typedef enum UDisplayContextType UDisplayContextType;
* @draft ICU 51
*/
enum UDisplayContext {
#ifndef U_HIDE_DRAFT_API
/**
* ================================
* DIALECT_HANDLING can be set to one of UDISPCTX_STANDARD_NAMES or
@ -104,6 +107,7 @@ enum UDisplayContext {
* @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_FOR_STANDALONE = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 4
#endif /* U_HIDE_DRAFT_API */
};
/**
* @draft ICU 51

6
icu4c/source/i18n/unicode/ugender.h
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 2010-2012, International Business Machines
* Copyright (C) 2010-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -11,6 +11,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/localpointer.h"
@ -60,7 +61,7 @@ typedef struct UGenderInfo UGenderInfo;
* @return A UGenderInfo for the specified locale, or NULL if an error occurred.
* @draft ICU 50
*/
U_STABLE const UGenderInfo* U_EXPORT2
U_DRAFT const UGenderInfo* U_EXPORT2
ugender_getInstance(const char *locale, UErrorCode *status);
@ -76,6 +77,7 @@ ugender_getInstance(const char *locale, UErrorCode *status);
U_DRAFT UGender U_EXPORT2
ugender_getListGender(const UGenderInfo* genderinfo, const UGender *genders, int32_t size, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

2
icu4c/source/i18n/unicode/ulocdata.h
View file

@ -45,8 +45,10 @@ typedef enum ULocaleDataExemplarSetType {
ULOCDATA_ES_AUXILIARY=1,
/** Index Character set @stable ICU 4.8 */
ULOCDATA_ES_INDEX=2,
#ifndef U_HIDE_DRAFT_API
/** Punctuation set @draft ICU 51 */
ULOCDATA_ES_PUNCTUATION=3,
#endif /* U_HIDE_DRAFT_API */
/** One higher than the last valid type @stable ICU 3.4 */
ULOCDATA_ES_COUNT=4
} ULocaleDataExemplarSetType;

14
icu4c/source/i18n/unicode/unum.h
View file

@ -250,6 +250,7 @@ typedef enum UNumberFormatPadPosition {
UNUM_PAD_AFTER_SUFFIX
} UNumberFormatPadPosition;
#ifndef U_HIDE_DRAFT_API
/**
* Constants for specifying short or long format.
* @draft ICU 51
@ -261,6 +262,7 @@ typedef enum UNumberCompactStyle {
UNUM_LONG
/** @draft ICU 51 */
} UNumberCompactStyle;
#endif /* U_HIDE_DRAFT_API */
/**
* Constants for specifying currency spacing
@ -795,6 +797,7 @@ typedef enum UNumberFormatAttribute {
*/
UNUM_PARSE_ALL_INPUT,
#endif
#ifndef U_HIDE_DRAFT_API
/**
* Scale, which adjusts the position of the
* decimal point when formatting. Amounts will be multiplied by 10 ^ (scale)
@ -804,7 +807,9 @@ typedef enum UNumberFormatAttribute {
* <p>Example: setting the scale to -4, 123 formats as "0.0123"
*
* @draft ICU 51 */
UNUM_SCALE,
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,
@ -813,13 +818,15 @@ typedef enum UNumberFormatAttribute {
* All items after this one are stored in boolean form.
* @internal */
UNUM_MAX_NONBOOLEAN_ATTRIBUTE = 0x0FFF,
#endif /* U_HIDE_INTERNAL_API */
#ifndef U_HIDE_DRAFT_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.
* Default: 0 (not set)
* @draft ICU 50
*/
UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS,
UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS = 0x1000,
/**
* if this attribute is set to 1, specifies that, if the pattern doesn't contain an exponent, the exponent will not be parsed. If the pattern does contain an exponent, this attribute has no effect.
* Has no effect on formatting.
@ -827,10 +834,13 @@ typedef enum UNumberFormatAttribute {
* @draft ICU 50
*/
UNUM_PARSE_NO_EXPONENT,
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_INTERNAL_API
/** Limit of boolean attributes.
* @internal */
UNUM_LIMIT_BOOLEAN_ATTRIBUTE
#endif /* U_HIDE_INTERNAL_API */
} UNumberFormatAttribute;
/**

6
icu4c/source/i18n/unicode/upluralrules.h
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 2010-2012, International Business Machines
* Copyright (C) 2010-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -37,6 +37,7 @@
* http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
*/
#ifndef U_HIDE_DRAFT_API
/**
* Type of plurals and PluralRules.
* @draft ICU 50
@ -62,6 +63,7 @@ enum UPluralType {
* @draft ICU 50
*/
typedef enum UPluralType UPluralType;
#endif /* U_HIDE_DRAFT_API */
/**
* Opaque UPluralRules object for use in C programs.
@ -82,6 +84,7 @@ typedef struct UPluralRules UPluralRules; /**< C typedef for struct UPluralRule
U_STABLE UPluralRules* U_EXPORT2
uplrules_open(const char *locale, UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Opens a new UPluralRules object using the predefined plural rules for a
* given locale and the plural type.
@ -93,6 +96,7 @@ uplrules_open(const char *locale, UErrorCode *status);
*/
U_DRAFT UPluralRules* U_EXPORT2
uplrules_openForType(const char *locale, UPluralType type, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Closes a UPluralRules object. Once closed it may no longer be used.

4
icu4c/source/i18n/unicode/uregex.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2004-2012, International Business Machines
* Copyright (C) 2004-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uregex.h
@ -51,7 +51,7 @@ typedef enum URegexpFlag{
Not implemented yet, just a placeholder, hence draft.
@draft ICU 2.4 */
UREGEX_CANON_EQ = 128,
#endif
#endif /* U_HIDE_DRAFT_API */
/** Enable case insensitive matching. @stable ICU 2.4 */
UREGEX_CASE_INSENSITIVE = 2,

16
icu4c/source/i18n/unicode/uspoof.h
View file

@ -203,13 +203,15 @@ typedef enum USpoofChecks {
*/
USPOOF_RESTRICTION_LEVEL = 16,
#ifndef U_HIDE_DEPRECATED_API
/** Check that an identifier contains only characters from a
* single script (plus chars from the common and inherited scripts.)
* Applies to checks of a single identifier check only.
* @deprecated ICU 51 Use RESTRICTION_LEVEL instead.
*/
USPOOF_SINGLE_SCRIPT = USPOOF_RESTRICTION_LEVEL,
#endif /* U_HIDE_DEPRECATED_API */
/** Check an identifier for the presence of invisible characters,
* such as zero-width spaces, or character sequences that are
* likely not to display, such as multiple occurrences of the same
@ -224,6 +226,7 @@ typedef enum USpoofChecks {
*/
USPOOF_CHAR_LIMIT = 64,
#ifndef U_HIDE_DRAFT_API
/**
* Check that an identifier does not include decimal digits from
* more than one numbering system.
@ -231,6 +234,7 @@ typedef enum USpoofChecks {
* @draft ICU 51
*/
USPOOF_MIXED_NUMBERS = 128,
#endif /* U_HIDE_DRAFT_API */
/**
* Enable all spoof checks.
@ -239,6 +243,7 @@ typedef enum USpoofChecks {
*/
USPOOF_ALL_CHECKS = 0xFFFF,
#ifndef U_HIDE_DRAFT_API
/**
* Enable the return of auxillary (non-error) information in the
* upper bits of the check results value.
@ -252,10 +257,12 @@ typedef enum USpoofChecks {
* @draft ICU 51
*/
USPOOF_AUX_INFO = 0x40000000
#endif /* U_HIDE_DRAFT_API */
} USpoofChecks;
#ifndef U_HIDE_DRAFT_API
/**
* Constants from UAX #39 for use in setRestrictionLevel(), and
* for returned identifier restriction levels in check results.
@ -295,6 +302,7 @@ typedef enum USpoofChecks {
*/
USPOOF_UNRESTRICTIVE = 0x50000000
} URestrictionLevel;
#endif /* U_HIDE_DRAFT_API */
/**
* Create a Unicode Spoof Checker, configured to perform all
@ -441,6 +449,7 @@ uspoof_setChecks(USpoofChecker *sc, int32_t checks, UErrorCode *status);
U_STABLE int32_t U_EXPORT2
uspoof_getChecks(const USpoofChecker *sc, UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Set the loosest restriction level allowed. The default if this function
* is not called is HIGHLY_RESTRICTIVE.
@ -462,6 +471,7 @@ uspoof_setRestrictionLevel(USpoofChecker *sc, URestrictionLevel restrictionLevel
*/
U_DRAFT URestrictionLevel U_EXPORT2
uspoof_getRestrictionLevel(const USpoofChecker *sc);
#endif /* U_HIDE_DRAFT_API */
/**
* Limit characters that are acceptable in identifiers being checked to those
@ -954,6 +964,7 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
#endif /* U_SHOW_CPLUSPLUS_API */
#ifndef U_HIDE_DRAFT_API
/**
* Get the set of Candidate Characters for Inclusion in Identifiers, as defined
* in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
@ -982,8 +993,6 @@ uspoof_getInclusionSet(UErrorCode *status);
U_DRAFT const USet * U_EXPORT2
uspoof_getRecommendedSet(UErrorCode *status);
#if U_SHOW_CPLUSPLUS_API
/**
@ -1015,6 +1024,7 @@ U_DRAFT const icu::UnicodeSet * U_EXPORT2
uspoof_getRecommendedUnicodeSet(UErrorCode *status);
#endif /* U_SHOW_CPLUSPLUS_API */
#endif /* U_HIDE_DRAFT_API */
/**
* Serialize the data for a spoof detector into a chunk of memory.

2
icu4c/source/io/unicode/ustdio.h
View file

@ -439,6 +439,7 @@ u_fsetcodepage(const char *codepage,
U_STABLE UConverter* U_EXPORT2 u_fgetConverter(UFILE *f);
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
/**
* Returns an alias to the number formatter being used for this file.
* @param f The UFILE to get the value from
@ -446,6 +447,7 @@ U_STABLE UConverter* U_EXPORT2 u_fgetConverter(UFILE *f);
* @draft ICU 51
*/
U_DRAFT const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *f);
#endif /* U_HIDE_DRAFT_API */
/* Output functions */