AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8428 remove @draft etc. API tags from non-API headers (impl, tests, samples)

Browse Source 
X-SVN-Rev: 30117
This commit is contained in:
Markus Scherer 2011-05-16 20:46:27 +00:00
parent 36f6ca2868
commit 02836844e6
19 changed files with 91 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/common/cmemory.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -275,7 +275,6 @@ public:
* @param resultCapacity will be set to the returned array's capacity (output-only)
* @return the array pointer;
* caller becomes responsible for deleting the array
* @draft ICU 4.4
*/
inline T *orphanOrClone(int32_t length, int32_t &resultCapacity);
private:
@ -448,7 +447,6 @@ public:
* @param resultCapacity will be set to the returned array's capacity (output-only)
* @return the header pointer;
* caller becomes responsible for deleting the array
* @draft ICU 4.4
*/
inline H *orphanOrClone(int32_t length, int32_t &resultCapacity);
private:

8
icu4c/source/common/unormimp.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2001-2010, International Business Machines
* Copyright (C) 2001-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -154,11 +154,11 @@ enum {
_NORM_DECOMP_LENGTH_MASK=0x7f
};
/* Constants for options flags for normalization. @draft ICU 2.6 */
/** Constants for options flags for normalization. */
enum {
/** Options bit 0, do not decompose Hangul syllables. @draft ICU 2.6 */
/** Options bit 0, do not decompose Hangul syllables. */
UNORM_NX_HANGUL=1,
/** Options bit 1, do not decompose CJK compatibility characters. @draft ICU 2.6 */
/** Options bit 1, do not decompose CJK compatibility characters. */
UNORM_NX_CJK_COMPAT=2
};

24
icu4c/source/common/uresimp.h
View File

@ -120,7 +120,6 @@ U_CFUNC UResourceBundle *ures_copyResb(UResourceBundle *r, const UResourceBundle
* Alternatively, you can supply a struct to be filled by this function.
* @param status fills in the outgoing error code.
* @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must delete it
* @draft ICU 2.2
*/
U_CAPI UResourceBundle* U_EXPORT2
ures_findResource(const char* pathToResource,
@ -140,7 +139,6 @@ ures_findResource(const char* pathToResource,
* Alternatively, you can supply a struct to be filled by this function.
* @param status fills in the outgoing error code.
* @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must delete it
* @draft ICU 2.2
*/
U_CAPI UResourceBundle* U_EXPORT2
ures_findSubResource(const UResourceBundle *resB,
@ -162,9 +160,8 @@ ures_findSubResource(const UResourceBundle *resB,
* @param status error code
* @return the actual buffer size needed for the full locale. If it's greater
* than resultCapacity, the returned full name will be truncated and an error code will be returned.
* @internal ICU 3.0
*/
U_INTERNAL int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
const char *path, const char *resName, const char *keyword, const char *locid,
UBool *isAvailable, UBool omitDefault, UErrorCode *status);
@ -175,9 +172,8 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
* @param keyword a particular keyword to consider, must match a top level resource name
* within the tree.
* @param status error code
* @internal ICU 3.0
*/
U_INTERNAL UEnumeration* U_EXPORT2
U_CAPI UEnumeration* U_EXPORT2
ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status);
@ -196,9 +192,8 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status)
* could be a non-failing error
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must delete it
* @internal ICU 3.0
*/
U_INTERNAL UResourceBundle* U_EXPORT2
U_CAPI UResourceBundle* U_EXPORT2
ures_getByKeyWithFallback(const UResourceBundle *resB,
const char* inKey,
UResourceBundle *fillIn,
@ -218,10 +213,8 @@ ures_getByKeyWithFallback(const UResourceBundle *resB,
* could be a non-failing error
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must delete it
* @internal ICU 3.4
* @draft ICU 3.4
*/
U_INTERNAL const UChar* U_EXPORT2
U_CAPI const UChar* U_EXPORT2
ures_getStringByKeyWithFallback(const UResourceBundle *resB,
const char* inKey,
int32_t* len,
@ -233,9 +226,8 @@ ures_getStringByKeyWithFallback(const UResourceBundle *resB,
* @param key the key for the version number
* @param ver fillin for the version number
* @param status error code
* @internal ICU 4.2
*/
U_INTERNAL void U_EXPORT2
U_CAPI void U_EXPORT2
ures_getVersionByKey(const UResourceBundle *resB,
const char *key,
UVersionInfo ver,
@ -250,9 +242,8 @@ ures_getVersionByKey(const UResourceBundle *resB,
* @return A version number string as specified in the resource bundle or its parent.
* The caller does not own this string.
* @see ures_getVersion
* @internal
*/
U_INTERNAL const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
ures_getVersionNumberInternal(const UResourceBundle *resourceBundle);
/**
@ -267,9 +258,8 @@ ures_getVersionNumberInternal(const UResourceBundle *resourceBundle);
* @param resourceBundle resource bundle in question
* @param status just for catching illegal arguments
* @return A Locale name
* @internal
*/
U_INTERNAL const char* U_EXPORT2
U_CAPI const char* U_EXPORT2
ures_getLocaleInternal(const UResourceBundle* resourceBundle,
UErrorCode* status);

14
icu4c/source/common/usc_impl.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2002, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -51,8 +51,6 @@
* uscript_closeRun(scriptRun);
* }
* </pre>
*
* @draft ICU 2.2
*/
struct UScriptRun;
@ -76,8 +74,6 @@ typedef struct UScriptRun UScriptRun;
*
* @return the address of <code>UScriptRun</code> object which will iterate over the text,
* or <code>NULL</code> if the operation failed.
*
* @draft ICU 2.2
*/
U_CAPI UScriptRun * U_EXPORT2
uscript_openRun(const UChar *src, int32_t length, UErrorCode *pErrorCode);
@ -87,8 +83,6 @@ uscript_openRun(const UChar *src, int32_t length, UErrorCode *pErrorCode);
* On return, scriptRun no longer points to a valid <code>UScriptRun</code> object.
*
* @param scriptRun is the <code>UScriptRun</code> object which will be freed.
*
* @draft ICU 2.2
*/
U_CAPI void U_EXPORT2
uscript_closeRun(UScriptRun *scriptRun);
@ -98,8 +92,6 @@ uscript_closeRun(UScriptRun *scriptRun);
* the beginning.
*
* @param scriptRun is the address of the <code>UScriptRun</code> object to be reset.
*
* @draft ICU 2.2
*/
U_CAPI void U_EXPORT2
uscript_resetRun(UScriptRun *scriptRun);
@ -118,8 +110,6 @@ uscript_resetRun(UScriptRun *scriptRun);
* @param pErrorCode is a pointer to a valid <code>UErrorCode</code> value. If this value
* indicates a failure on entry, the function will immediately return.
* On exit the value will indicate the success of the operation.
*
* @draft ICU 2.2
*/
U_CAPI void U_EXPORT2
uscript_setRunText(UScriptRun *scriptRun, const UChar *src, int32_t length, UErrorCode *pErrorCode);
@ -140,8 +130,6 @@ uscript_setRunText(UScriptRun *scriptRun, const UChar *src, int32_t length, UErr
* script of the current run. This pointer can be <code>NULL</code> if the value is not needed.
*
* @return true if there was another script run.
*
* @draft ICU 2.2
*/
U_CAPI UBool U_EXPORT2
uscript_nextRun(UScriptRun *scriptRun, int32_t *pRunStart, int32_t *pRunLimit, UScriptCode *pRunScript);

25
icu4c/source/common/ustr_imp.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2010, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ustr_imp.h
@ -30,7 +30,6 @@
/**
* Option bit for unorm_compare:
* Perform case-insensitive comparison.
* @draft ICU 2.2
*/
#define U_COMPARE_IGNORE_CASE 0x10000
#endif
@ -38,7 +37,6 @@
/**
* Internal option for unorm_cmpEquivFold() for strncmp style.
* If set, checks for both string length and terminating NUL.
* @internal
*/
#define _STRNCMP_STYLE 0x1000
@ -47,7 +45,6 @@
* Works in strcmp style (both lengths -1),
* strncmp style (lengths equal and >=0, flag TRUE),
* and memcmp/UnicodeString style (at least one length >=0).
* @internal
*/
U_CFUNC int32_t U_EXPORT2
uprv_strCompare(const UChar *s1, int32_t length1,
@ -58,7 +55,6 @@ uprv_strCompare(const UChar *s1, int32_t length1,
* Internal API, used by u_strcasecmp() etc.
* Compare strings case-insensitively,
* in code point order or code unit order.
* @internal
*/
U_CFUNC int32_t
u_strcmpFold(const UChar *s1, int32_t length1,
@ -71,7 +67,6 @@ u_strcmpFold(const UChar *s1, int32_t length1,
* This must be used before internal functions are called that do
* not perform this check.
* Generate a debug assertion failure if data is not loaded.
* @internal
*/
U_CFUNC UBool
uprv_haveProperties(UErrorCode *pErrorCode);
@ -81,7 +76,6 @@ uprv_haveProperties(UErrorCode *pErrorCode);
* Intended primarily for use from u_init().
* Has no effect if property data is already loaded.
* NOT thread safe.
* @internal
*/
/*U_CFUNC int8_t
uprv_loadPropsData(UErrorCode *errorCode);*/
@ -91,9 +85,6 @@ uprv_loadPropsData(UErrorCode *errorCode);*/
* ustring.h/ustrcase.c and UnicodeString case mapping functions.
*/
/**
* @internal
*/
struct UCaseMap {
const UCaseProps *csp;
#if !UCONFIG_NO_BREAK_ITERATION
@ -108,9 +99,6 @@ struct UCaseMap {
typedef struct UCaseMap UCaseMap;
#endif
/**
* @internal
*/
enum {
TO_LOWER,
TO_UPPER,
@ -118,9 +106,6 @@ enum {
FOLD_CASE
};
/**
* @internal
*/
U_CFUNC int32_t
ustr_toLower(const UCaseProps *csp,
UChar *dest, int32_t destCapacity,
@ -128,9 +113,6 @@ ustr_toLower(const UCaseProps *csp,
const char *locale,
UErrorCode *pErrorCode);
/**
* @internal
*/
U_CFUNC int32_t
ustr_toUpper(const UCaseProps *csp,
UChar *dest, int32_t destCapacity,
@ -140,9 +122,6 @@ ustr_toUpper(const UCaseProps *csp,
#if !UCONFIG_NO_BREAK_ITERATION
/**
* @internal
*/
U_CFUNC int32_t
ustr_toTitle(const UCaseProps *csp,
UChar *dest, int32_t destCapacity,
@ -155,7 +134,6 @@ ustr_toTitle(const UCaseProps *csp,
/**
* Internal case folding function.
* @internal
*/
U_CFUNC int32_t
ustr_foldCase(const UCaseProps *csp,
@ -175,7 +153,6 @@ ustr_foldCase(const UCaseProps *csp,
* @param length Number of UChars that were (to be) written to dest.
* @param pErrorCode ICU error code.
* @return length
* @internal
*/
U_CAPI int32_t U_EXPORT2
u_terminateUChars(UChar *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode);

20
icu4c/source/i18n/cpdtrans.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1999-2009, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -34,7 +34,6 @@ class TransliteratorRegistry;
* Transliterator} for details.
*
* @author Alan Liu
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
class U_I18N_API CompoundTransliterator : public Transliterator {
@ -59,7 +58,6 @@ public:
* <tt>filter.contains()</tt> returns <tt>false</tt> will not be
* altered by this transliterator. If <tt>filter</tt> is
* <tt>null</tt> then no filtering is applied.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
CompoundTransliterator(Transliterator* const transliterators[],
int32_t transliteratorCount,
@ -71,7 +69,6 @@ public:
* @param dir either UTRANS_FORWARD or UTRANS_REVERSE
* @param adoptedFilter a global filter for this compound transliterator
* or NULL
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
CompoundTransliterator(const UnicodeString& id,
UTransDirection dir,
@ -82,33 +79,28 @@ public:
/**
* Constructs a new compound transliterator in the FORWARD
* direction with a NULL filter.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
CompoundTransliterator(const UnicodeString& id,
UParseError& parseError,
UErrorCode& status);
/**
* Destructor.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual ~CompoundTransliterator();
/**
* Copy constructor.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
CompoundTransliterator(const CompoundTransliterator&);
/**
* Transliterator API.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual Transliterator* clone(void) const;
/**
* Returns the number of transliterators in this chain.
* @return number of transliterators in this chain.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual int32_t getCount(void) const;
@ -116,20 +108,17 @@ public:
* Returns the transliterator at the given index in this chain.
* @param idx index into chain, from 0 to <code>getCount() - 1</code>
* @return transliterator at the given index
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual const Transliterator& getTransliterator(int32_t idx) const;
/**
* Sets the transliterators.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
void setTransliterators(Transliterator* const transliterators[],
int32_t count);
/**
* Adopts the transliterators.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
void adoptTransliterators(Transliterator* adoptedTransliterators[],
int32_t count);
@ -144,7 +133,6 @@ public:
* character to their hex escape representations, \uxxxx or
* \Uxxxxxxxx. Unprintable characters are those other than
* U+000A, U+0020..U+007E.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual UnicodeString& toRules(UnicodeString& result,
UBool escapeUnprintable) const;
@ -164,7 +152,6 @@ public:
protected:
/**
* Implements {@link Transliterator#handleTransliterate}.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
virtual void handleTransliterate(Replaceable& text, UTransPosition& idx,
UBool incremental) const;
@ -173,15 +160,11 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static UClassID U_EXPORT2 getStaticClassID();
@ -195,7 +178,6 @@ private:
/**
* Assignment operator.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
CompoundTransliterator& operator=(const CompoundTransliterator&);

6
icu4c/source/i18n/funcrepl.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2007, International Business Machines Corporation
* Copyright (c) 2002-2011, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -102,15 +102,11 @@ class FunctionReplacer : public UnicodeFunctor, public UnicodeReplacer {
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static UClassID U_EXPORT2 getStaticClassID();
};

1
icu4c/source/i18n/olsontz.h
View File

@ -269,7 +269,6 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone {
* the timezone transition rules. On output, actual number of
* rules filled in the array will be set.
* @param status Receives error status code.
* @draft ICU 3.8
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/;

6
icu4c/source/i18n/quant.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2001-2007, International Business Machines Corporation
* Copyright (C) 2001-2011, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -100,15 +100,11 @@ class Quantifier : public UnicodeFunctor, public UnicodeMatcher {
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static UClassID U_EXPORT2 getStaticClassID();

6
icu4c/source/i18n/strmatch.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2001-2004, International Business Machines Corporation
* Copyright (C) 2001-2011, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -196,15 +196,11 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static UClassID U_EXPORT2 getStaticClassID();

6
icu4c/source/i18n/strrepl.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2004, International Business Machines Corporation
* Copyright (c) 2002-2011, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -143,15 +143,11 @@ class StringReplacer : public UnicodeFunctor, public UnicodeReplacer {
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual UClassID getDynamicClassID() const;
};

76
icu4c/source/i18n/vzone.h
View File

@ -26,7 +26,6 @@ struct VZone;
/**
* A UnicodeSet. Use the vzone_* API to manipulate. Create with
* vzone_open*, and destroy with vzone_close.
* @stable ICU 2.4
*/
typedef struct VZone VZone;
#endif
@ -41,11 +40,10 @@ typedef struct VZone VZone;
* @param idLength, length of the ID parameter
* @return A vzone object initialized by the time zone ID,
* or NULL when the ID is unknown.
* @draft ICU 4.4
*/
U_DRAFT VZone* U_EXPORT2
U_CAPI VZone* U_EXPORT2
vzone_openID(const UChar* ID, int32_t idLength);
/**
* Create a vzone instance by RFC2445 VTIMEZONE data
* @param vtzdata The string including VTIMEZONE data block
@ -53,27 +51,24 @@ vzone_openID(const UChar* ID, int32_t idLength);
* @param status Output param to filled in with a success or an error.
* @return A vzone initialized by the VTIMEZONE data or
* NULL if failed to load the rule from the VTIMEZONE data.
* @draft ICU 4.4
*/
U_DRAFT VZone* U_EXPORT2
U_CAPI VZone* U_EXPORT2
vzone_openData(const UChar* vtzdata, int32_t vtzdataLength, UErrorCode& status);
/**
* Disposes of the storage used by a VZone object. This function should
* be called exactly once for objects returned by vzone_open*.
* @param set the object to dispose of
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_close(VZone* zone);
/**
* Returns a copy of this object.
* @param zone the original vzone
* @return the newly allocated copy of the vzone
* @draft ICU 4.4
*/
U_DRAFT VZone* U_EXPORT2
U_CAPI VZone* U_EXPORT2
vzone_clone(const VZone *zone);
/**
@ -82,9 +77,8 @@ vzone_clone(const VZone *zone);
* @param zone1 to be checked for containment
* @param zone2 to be checked for containment
* @return true if the test condition is met
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_equals(const VZone* zone1, const VZone* zone2);
/**
@ -95,9 +89,8 @@ vzone_equals(const VZone* zone1, const VZone* zone2);
* @param url Receives the RFC2445 TZURL property value.
* @param urlLength, length of the url
* @return TRUE if TZURL attribute is available and value is set.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_getTZURL(VZone* zone, UChar* & url, int32_t & urlLength);
/**
@ -105,9 +98,8 @@ vzone_getTZURL(VZone* zone, UChar* & url, int32_t & urlLength);
* @param zone, the vzone to use
* @param url The TZURL property value.
* @param urlLength, length of the url
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_setTZURL(VZone* zone, UChar* url, int32_t urlLength);
/**
@ -118,18 +110,16 @@ vzone_setTZURL(VZone* zone, UChar* url, int32_t urlLength);
* @param zone, the vzone to use
* @param lastModified Receives the last modified date.
* @return TRUE if lastModified attribute is available and value is set.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_getLastModified(VZone* zone, UDate& lastModified);
/**
* Sets the RFC2445 LAST-MODIFIED property value.
* @param zone, the vzone to use
* @param lastModified The LAST-MODIFIED date.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_setLastModified(VZone* zone, UDate lastModified);
/**
@ -138,9 +128,8 @@ vzone_setLastModified(VZone* zone, UDate lastModified);
* @param result Output param to filled in with the VTIMEZONE data.
* @param resultLength, length of the result output
* @param status Output param to filled in with a success or an error.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_write(VZone* zone, UChar* & result, int32_t & resultLength, UErrorCode& status);
/**
@ -151,9 +140,8 @@ vzone_write(VZone* zone, UChar* & result, int32_t & resultLength, UErrorCode& st
* @param result Output param to filled in with the VTIMEZONE data.
* @param resultLength, length of the result output
* @param status Output param to filled in with a success or an error.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_writeFromStart(VZone* zone, UDate start, UChar* & result, int32_t & resultLength, UErrorCode& status);
/**
@ -168,9 +156,8 @@ vzone_writeFromStart(VZone* zone, UDate start, UChar* & result, int32_t & result
* @param time The date used for rule extraction.
* @param result Output param to filled in with the VTIMEZONE data.
* @param status Output param to filled in with a success or an error.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_writeSimple(VZone* zone, UDate time, UChar* & result, int32_t & resultLength, UErrorCode& status);
/**
@ -196,9 +183,8 @@ vzone_writeSimple(VZone* zone, UDate time, UChar* & result, int32_t & resultLeng
* @param millis The reference date's milliseconds in day, local standard time
* @param status Output param to filled in with a success or an error.
* @return The offset in milliseconds to add to GMT to get local time.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
vzone_getOffset(VZone* zone, uint8_t era, int32_t year, int32_t month, int32_t day,
uint8_t dayOfWeek, int32_t millis, UErrorCode& status);
@ -220,9 +206,8 @@ vzone_getOffset(VZone* zone, uint8_t era, int32_t year, int32_t month, int32_t d
* @param monthLength The length of the given month in days.
* @param status Output param to filled in with a success or an error.
* @return The offset in milliseconds to add to GMT to get local time.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
vzone_getOffset2(VZone* zone, uint8_t era, int32_t year, int32_t month, int32_t day,
uint8_t dayOfWeek, int32_t millis,
int32_t monthLength, UErrorCode& status);
@ -248,9 +233,8 @@ vzone_getOffset2(VZone* zone, uint8_t era, int32_t year, int32_t month, int32_t
* effect, this value is zero; otherwise it is a positive value,
* typically one hour.
* @param ec input-output error code
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_getOffset3(VZone* zone, UDate date, UBool local, int32_t& rawOffset,
int32_t& dstOffset, UErrorCode& ec);
@ -260,9 +244,8 @@ vzone_getOffset3(VZone* zone, UDate date, UBool local, int32_t& rawOffset,
*
* @param zone, the vzone to use
* @param offsetMillis The new raw GMT offset for this time zone.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
vzone_setRawOffset(VZone* zone, int32_t offsetMillis);
/**
@ -271,9 +254,8 @@ vzone_setRawOffset(VZone* zone, int32_t offsetMillis);
*
* @param zone, the vzone to use
* @return The TimeZone's raw GMT offset.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
vzone_getRawOffset(VZone* zone);
/**
@ -281,9 +263,8 @@ vzone_getRawOffset(VZone* zone);
* @param zone, the vzone to use
* @return true if this time zone uses daylight savings time,
* false, otherwise.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_useDaylightTime(VZone* zone);
/**
@ -298,7 +279,6 @@ vzone_useDaylightTime(VZone* zone);
* @param status Output param filled in with success/error code.
* @return true if the given date is in daylight savings time,
* false, otherwise.
* @internal ICU 2.4. Use Calendar::inDaylightTime() instead.
*/
U_INTERNAL UBool U_EXPORT2
vzone_inDaylightTime(VZone* zone, UDate date, UErrorCode& status);
@ -310,9 +290,8 @@ vzone_inDaylightTime(VZone* zone, UDate date, UErrorCode& status);
* @param other the <code>TimeZone</code> object to be compared with
* @return true if the given zone is the same as this one,
* with the possible exception of the ID
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_hasSameRules(VZone* zone, const VZone* other);
/**
@ -322,9 +301,8 @@ vzone_hasSameRules(VZone* zone, const VZone* other);
* @param inclusive Whether the base time is inclusive or not.
* @param result Receives the first transition after the base time.
* @return TRUE if the transition is found.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_getNextTransition(VZone* zone, UDate base, UBool inclusive, ZTrans* result);
/**
@ -334,9 +312,8 @@ vzone_getNextTransition(VZone* zone, UDate base, UBool inclusive, ZTrans* result
* @param inclusive Whether the base time is inclusive or not.
* @param result Receives the most recent transition before the base time.
* @return TRUE if the transition is found.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
vzone_getPreviousTransition(VZone* zone, UDate base, UBool inclusive, ZTrans* result);
/**
@ -346,9 +323,8 @@ vzone_getPreviousTransition(VZone* zone, UDate base, UBool inclusive, ZTrans* re
* @param zone, the vzone to use
* @param status Receives error status code.
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
vzone_countTransitionRules(VZone* zone, UErrorCode& status);
/**
@ -361,9 +337,8 @@ vzone_countTransitionRules(VZone* zone, UErrorCode& status);
* </pre>
* @param zone, the vzone to use
* @return The class ID for all objects of this class.
* @draft ICU 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
vzone_getStaticClassID(VZone* zone);
/**
@ -376,9 +351,8 @@ vzone_getStaticClassID(VZone* zone);
* @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 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
vzone_getDynamicClassID(VZone* zone);
#endif // __VZONE_H

11
icu4c/source/i18n/windtfmt.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2005-2009, International Business Machines
* Copyright (C) 2005-2011, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -62,7 +62,6 @@ public:
* not delete the Calendar object after it is adopted by this call.
*
* @param calendarToAdopt Calendar object to be adopted.
* @draft ICU 3.6
*/
virtual void adoptCalendar(Calendar* calendarToAdopt);
@ -71,8 +70,6 @@ public:
* calendar for the specified or default locale is used.
*
* @param newCalendar Calendar object to be set.
*
* @draft ICU 3.6
*/
virtual void setCalendar(const Calendar& newCalendar);
@ -81,16 +78,12 @@ public:
* no longer owns the TimeZone object and should not delete it after this call.
*
* @param zoneToAdopt the TimeZone to be adopted.
*
* @draft ICU 3.6
*/
virtual void adoptTimeZone(TimeZone* zoneToAdopt);
/**
* Sets the time zone for the calendar of this DateFormat object.
* @param zone the new time zone.
*
* @draft ICU 3.6
*/
virtual void setTimeZone(const TimeZone& zone);
@ -103,7 +96,6 @@ public:
* . erived::getStaticClassID()) ...
* </pre>
* @return The class ID for all objects of this class.
* @draft ICU 3.6
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
@ -116,7 +108,6 @@ public:
* @return The class ID for this object. All objects of a
* given class have the same class ID. Objects of
* other classes have different class IDs.
* @draft ICU 3.6
*/
virtual UClassID getDynamicClassID(void) const;

9
icu4c/source/i18n/winnmfmt.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2005-2007, International Business Machines
* Copyright (C) 2005-2011, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -56,7 +56,6 @@ public:
* @param pos On input: an alignment field, if desired.
* On output: the offsets of the alignment field.
* @return Reference to 'appendTo' parameter.
* @draft ICU 3.6
*/
virtual UnicodeString& format(double number,
UnicodeString& appendTo,
@ -71,7 +70,6 @@ public:
* @param pos On input: an alignment field, if desired.
* On output: the offsets of the alignment field.
* @return Reference to 'appendTo' parameter.
* @draft ICU 3.6
*/
virtual UnicodeString& format(int32_t number,
UnicodeString& appendTo,
@ -86,7 +84,6 @@ public:
* @param pos On input: an alignment field, if desired.
* On output: the offsets of the alignment field.
* @return Reference to 'appendTo' parameter.
* @draft ICU 3.6
*/
virtual UnicodeString& format(int64_t number,
UnicodeString& appendTo,
@ -107,7 +104,6 @@ public:
* the new value.
* @param newValue the new value to be set.
* @see getMaximumFractionDigits
* @draft ICU 3.6
*/
virtual void setMaximumFractionDigits(int32_t newValue);
@ -119,7 +115,6 @@ public:
* the new value
* @param newValue the new value to be set.
* @see getMinimumFractionDigits
* @draft ICU 3.6
*/
virtual void setMinimumFractionDigits(int32_t newValue);
@ -132,7 +127,6 @@ public:
* . erived::getStaticClassID()) ...
* </pre>
* @return The class ID for all objects of this class.
* @stable ICU 2.0
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
@ -145,7 +139,6 @@ public:
* @return The class ID for this object. All objects of a
* given class have the same class ID. Objects of
* other classes have different class IDs.
* @stable ICU 2.0
*/
virtual UClassID getDynamicClassID(void) const;

65
icu4c/source/i18n/zrule.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2009-2010, International Business Machines Corporation and *
* Copyright (C) 2009-2011, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -21,7 +21,6 @@
/**
* A TimeZoneRule. Use the zrule_* API to manipulate. Create with
* zrule_open*, and destroy with zrule_close.
* @draft ICU 4.4
*/
struct ZRule;
typedef struct ZRule ZRule;
@ -29,7 +28,6 @@ typedef struct ZRule ZRule;
/**
* An InitialTimeZoneRule. Use the izrule_* API to manipulate. Create with
* izrule_open*, and destroy with izrule_close.
* @draft ICU 4.4
*/
struct IZRule;
typedef struct IZRule IZRule;
@ -37,7 +35,6 @@ typedef struct IZRule IZRule;
/**
* An AnnualTimeZoneRule. Use the azrule_* API to manipulate. Create with
* azrule_open*, and destroy with azrule_close.
* @draft ICU 4.4
*/
struct AZRule;
typedef struct AZRule AZRule;
@ -52,9 +49,8 @@ typedef struct AZRule AZRule;
* Disposes of the storage used by a ZRule object. This function should
* be called exactly once for objects returned by zrule_open*.
* @param set the object to dispose of
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
zrule_close(ZRule* rule);
/**
@ -63,9 +59,8 @@ zrule_close(ZRule* rule);
* @param rule1 to be checked for containment
* @param rule2 to be checked for containment
* @return true if the test condition is met
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
zrule_equals(const ZRule* rule1, const ZRule* rule2);
/**
@ -73,18 +68,16 @@ zrule_equals(const ZRule* rule1, const ZRule* rule2);
* @param rule, the Zrule to use
* @param name Receives the name of this time zone.
* @param nameLength, length of the returned name
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
zrule_getName(ZRule* rule, UChar* name, int32_t nameLength);
/**
* Gets the standard time offset.
* @param rule, the Zrule to use
* @return The standard time offset from UTC in milliseconds.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
zrule_getRawOffset(ZRule* rule);
/**
@ -92,9 +85,8 @@ zrule_getRawOffset(ZRule* rule);
* @param rule, the Zrule to use
* @return The amount of daylight saving offset used by this rule
* in milliseconds.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
zrule_getDSTSavings(ZRule* rule);
/**
@ -104,9 +96,8 @@ zrule_getDSTSavings(ZRule* rule);
* @param rule1 to be checked for containment
* @param rule2 to be checked for containment
* @return true if the other <code>TimeZoneRule</code> is the same as this one.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
zrule_isEquivalentTo(ZRule* rule1, ZRule* rule2);
/*********************************************************************
@ -121,27 +112,24 @@ zrule_isEquivalentTo(ZRule* rule1, ZRule* rule2);
* @param rawOffset The UTC offset of its standard time in milliseconds.
* @param dstSavings The amount of daylight saving offset adjustment in milliseconds.
* If this ia a rule for standard time, the value of this argument is 0.
* @draft ICU 4.4
*/
U_DRAFT IZRule* U_EXPORT2
U_CAPI IZRule* U_EXPORT2
izrule_open(const UChar* name, int32_t nameLength, int32_t rawOffset, int32_t dstSavings);
/**
* Disposes of the storage used by a IZRule object. This function should
* be called exactly once for objects returned by izrule_open*.
* @param set the object to dispose of
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
izrule_close(IZRule* rule);
/**
* Returns a copy of this object.
* @param rule the original IZRule
* @return the newly allocated copy of the IZRule
* @draft ICU 4.4
*/
U_DRAFT IZRule* U_EXPORT2
U_CAPI IZRule* U_EXPORT2
izrule_clone(IZRule *rule);
/**
@ -150,9 +138,8 @@ izrule_clone(IZRule *rule);
* @param rule1 to be checked for containment
* @param rule2 to be checked for containment
* @return true if the test condition is met
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_equals(const IZRule* rule1, const IZRule* rule2);
/**
@ -160,18 +147,16 @@ izrule_equals(const IZRule* rule1, const IZRule* rule2);
* @param rule, the IZrule to use
* @param name Receives the name of this time zone.
* @param nameLength, length of the returned name
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
izrule_getName(IZRule* rule, UChar* & name, int32_t & nameLength);
/**
* Gets the standard time offset.
* @param rule, the IZrule to use
* @return The standard time offset from UTC in milliseconds.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
izrule_getRawOffset(IZRule* rule);
/**
@ -179,9 +164,8 @@ izrule_getRawOffset(IZRule* rule);
* @param rule, the IZrule to use
* @return The amount of daylight saving offset used by this rule
* in milliseconds.
* @draft ICU 4.4
*/
U_DRAFT int32_t U_EXPORT2
U_CAPI int32_t U_EXPORT2
izrule_getDSTSavings(IZRule* rule);
/**
@ -191,9 +175,8 @@ izrule_getDSTSavings(IZRule* rule);
* @param rule1 to be checked for containment
* @param rule2 to be checked for containment
* @return true if the other <code>TimeZoneRule</code> is the same as this one.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_isEquivalentTo(IZRule* rule1, IZRule* rule2);
/**
@ -206,9 +189,8 @@ izrule_isEquivalentTo(IZRule* rule1, IZRule* rule2);
* @param result Receives the very first time when this rule takes effect.
* @return true if the start time is available. When false is returned, output parameter
* "result" is unchanged.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_getFirstStart(IZRule* rule, int32_t prevRawOffset, int32_t prevDSTSavings,
UDate& result);
@ -222,9 +204,8 @@ izrule_getFirstStart(IZRule* rule, int32_t prevRawOffset, int32_t prevDSTSavings
* @param result Receives the final time when this rule takes effect.
* @return true if the start time is available. When false is returned, output parameter
* "result" is unchanged.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_getFinalStart(IZRule* rule, int32_t prevRawOffset, int32_t prevDSTSavings,
UDate& result);
@ -241,9 +222,8 @@ izrule_getFinalStart(IZRule* rule, int32_t prevRawOffset, int32_t prevDSTSavings
* the specified base time.
* @return true if the start time is available. When false is returned, output parameter
* "result" is unchanged.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_getNextStart(IZRule* rule, UDate base, int32_t prevRawOffset,
int32_t prevDSTSavings, UBool inclusive, UDate& result);
@ -260,9 +240,8 @@ izrule_getNextStart(IZRule* rule, UDate base, int32_t prevRawOffset,
* the specified base time.
* @return true if the start time is available. When false is returned, output parameter
* "result" is unchanged.
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
izrule_getPreviousStart(IZRule* rule, UDate base, int32_t prevRawOffset,
int32_t prevDSTSavings, UBool inclusive, UDate& result);
@ -277,9 +256,8 @@ izrule_getPreviousStart(IZRule* rule, UDate base, int32_t prevRawOffset,
* </pre>
* @param rule The IZrule to use
* @return The class ID for all objects of this class.
* @draft ICU 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
izrule_getStaticClassID(IZRule* rule);
/**
@ -292,9 +270,8 @@ izrule_getStaticClassID(IZRule* rule);
* @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 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
izrule_getDynamicClassID(IZRule* rule);
#endif

50
icu4c/source/i18n/ztrans.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 2009-2010, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 2009-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
#ifndef __ZTRANS_H
@ -21,7 +21,6 @@
/**
* A TimeZoneTransition. Use the ztrans_* API to manipulate. Create with
* ztrans_open*, and destroy with ztrans_close.
* @draft ICU 4.4
*/
struct ZTrans;
typedef struct ZTrans ZTrans;
@ -35,34 +34,30 @@ typedef struct ZTrans ZTrans;
* @param time The time of transition in milliseconds since the base time.
* @param from The time zone rule used before the transition.
* @param to The time zone rule used after the transition.
* @draft ICU 4.4
*/
U_DRAFT ZTrans* U_EXPORT2
U_CAPI ZTrans* U_EXPORT2
ztrans_open(UDate time, const void* from, const void* to);
/**
* Constructs an empty <code>TimeZoneTransition</code>
* @draft ICU 4.4
*/
U_DRAFT ZTrans* U_EXPORT2
U_CAPI ZTrans* U_EXPORT2
ztrans_openEmpty();
/**
* Disposes of the storage used by a ZTrans object. This function should
* be called exactly once for objects returned by ztrans_open*.
* @param trans the object to dispose of
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_close(ZTrans *trans);
/**
* Returns a copy of this object.
* @param rule the original ZRule
* @return the newly allocated copy of the ZRule
* @draft ICU 4.4
*/
U_DRAFT ZTrans* U_EXPORT2
U_CAPI ZTrans* U_EXPORT2
ztrans_clone(ZTrans *trans);
/**
@ -71,36 +66,32 @@ ztrans_clone(ZTrans *trans);
* @param trans1 to be checked for containment
* @param trans2 to be checked for containment
* @return true if the test condition is met
* @draft ICU 4.4
*/
U_DRAFT UBool U_EXPORT2
U_CAPI UBool U_EXPORT2
ztrans_equals(const ZTrans* trans1, const ZTrans* trans2);
/**
* Returns the time of transition in milliseconds.
* param trans, the transition to use
* @return The time of the transition in milliseconds since the 1970 Jan 1 epoch time.
* @draft ICU 4.4
*/
U_DRAFT UDate U_EXPORT2
U_CAPI UDate U_EXPORT2
ztrans_getTime(ZTrans* trans);
/**
* Sets the time of transition in milliseconds.
* param trans, the transition to use
* @param time The time of the transition in milliseconds since the 1970 Jan 1 epoch time.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_setTime(ZTrans* trans, UDate time);
/**
* Returns the rule used before the transition.
* param trans, the transition to use
* @return The time zone rule used after the transition.
* @draft ICU 4.4
*/
U_DRAFT void* U_EXPORT2
U_CAPI void* U_EXPORT2
ztrans_getFrom(ZTrans* & trans);
/**
@ -109,9 +100,8 @@ ztrans_getFrom(ZTrans* & trans);
* param trans, the transition to use
* param trans, the transition to use
* @param from The time zone rule used before the transition.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_setFrom(ZTrans* trans, const void* from);
/**
@ -119,18 +109,16 @@ ztrans_setFrom(ZTrans* trans, const void* from);
* not delete the TimeZoneRule object passed in.
* param trans, the transition to use
* @param from The time zone rule used before the transition.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_adoptFrom(ZTrans* trans, void* from);
/**
* Returns the rule used after the transition.
* param trans, the transition to use
* @return The time zone rule used after the transition.
* @draft ICU 4.4
*/
U_DRAFT void* U_EXPORT2
U_CAPI void* U_EXPORT2
ztrans_getTo(ZTrans* trans);
/**
@ -138,9 +126,8 @@ ztrans_getTo(ZTrans* trans);
* responsible for deleting the TimeZoneRule object.
* param trans, the transition to use
* @param to The time zone rule used after the transition.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_setTo(ZTrans* trans, const void* to);
/**
@ -148,9 +135,8 @@ ztrans_setTo(ZTrans* trans, const void* to);
* not delete the TimeZoneRule object passed in.
* param trans, the transition to use
* @param to The time zone rule used after the transition.
* @draft ICU 4.4
*/
U_DRAFT void U_EXPORT2
U_CAPI void U_EXPORT2
ztrans_adoptTo(ZTrans* trans, void* to);
/**
@ -163,9 +149,8 @@ ztrans_adoptTo(ZTrans* trans, void* to);
* </pre>
* param trans, the transition to use
* @return The class ID for all objects of this class.
* @draft ICU 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
ztrans_getStaticClassID(ZTrans* trans);
/**
@ -178,9 +163,8 @@ ztrans_getStaticClassID(ZTrans* trans);
* @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 4.4
*/
U_DRAFT UClassID U_EXPORT2
U_CAPI UClassID U_EXPORT2
ztrans_getDynamicClassID(ZTrans* trans);
#endif

10
icu4c/source/samples/layout/ScriptCompositeFontInstance.h
View File

@ -1,7 +1,7 @@
/*
* %W% %E%
*
* (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
*
*/
@ -71,8 +71,6 @@ public:
* <code>NULL</code> if there is an error.
*
* @see LEScripts.h
*
* @draft ICU 2.6
*/
virtual const LEFontInstance *getSubFont(const LEUnicode chars[], le_int32 *offset, le_int32 limit, le_int32 script, LEErrorCode &success) const;
@ -83,8 +81,6 @@ public:
* @param ch - the character
*
* @return the glyph index
*
* @draft ICU 2.6
*/
virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch) const;
@ -112,15 +108,11 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.2
*/
virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.2
*/
static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }

9
icu4c/source/test/intltest/idnaref.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2004, International Business Machines
* Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -26,7 +26,7 @@
#define IDNAREF_DEFAULT 0x0000
#define IDNAREF_ALLOW_UNASSIGNED 0x0001
#define IDNAREF_USE_STD3_RULES 0x0002
/**
* This function implements the ToASCII operation as defined in the IDNA draft.
* This operation is done on <b>single labels</b> before sending it to something that expects
@ -57,7 +57,6 @@
* too many code points.
* U_BUFFER_OVERFLOW_ERROR if destCapacity is not enough
* @return Number of ASCII characters converted.
* @draft ICU 2.6
*/
U_CFUNC int32_t U_EXPORT2
idnaref_toASCII(const UChar* src, int32_t srcLength,
@ -96,7 +95,6 @@ idnaref_toASCII(const UChar* src, int32_t srcLength,
* too many code points.
* U_BUFFER_OVERFLOW_ERROR if destCapacity is not enough
* @return Number of Unicode characters converted.
* @draft ICU 2.6
*/
U_CFUNC int32_t U_EXPORT2
idnaref_toUnicode(const UChar* src, int32_t srcLength,
@ -140,7 +138,6 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength,
* too many code points.
* U_BUFFER_OVERFLOW_ERROR if destCapacity is not enough
* @return Number of ASCII characters converted.
* @draft ICU 2.6
*/
U_CFUNC int32_t U_EXPORT2
idnaref_IDNToASCII( const UChar* src, int32_t srcLength,
@ -180,7 +177,6 @@ idnaref_IDNToASCII( const UChar* src, int32_t srcLength,
* too many code points.
* U_BUFFER_OVERFLOW_ERROR if destCapacity is not enough
* @return Number of ASCII characters converted.
* @draft ICU 2.6
*/
U_CFUNC int32_t U_EXPORT2
idnaref_IDNToUnicode( const UChar* src, int32_t srcLength,
@ -215,7 +211,6 @@ idnaref_IDNToUnicode( const UChar* src, int32_t srcLength,
* @param status ICU error code in/out parameter.
* Must fulfill U_SUCCESS before the function call.
* @return <0 or 0 or >0 as usual for string comparisons
* @draft ICU 2.6
*/
U_CFUNC int32_t U_EXPORT2
idnaref_compare( const UChar *s1, int32_t length1,

15
icu4c/source/test/intltest/nptrans.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2006, International Business Machines
* Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -50,18 +50,14 @@ public :
inline UBool isProhibited(UChar32 ch);
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @draft ICU 2.6
*/
inline UClassID getDynamicClassID() const { return getStaticClassID(); }
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @draft ICU 2.6
*/
static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
@ -82,7 +78,6 @@ public :
* @param status ICU error code in/out parameter.
* Must fulfill U_SUCCESS before the function call.
* @return The number of UChars in the destination buffer
*
*/
int32_t map(const UChar* src, int32_t srcLength,
UChar* dest, int32_t destCapacity,
@ -115,14 +110,12 @@ public :
* Ascertain if the given code point is a label separator as specified by IDNA
*
* @return TRUE is the code point is a label separator
*
*
*/
UBool isLabelSeparator(UChar32 ch, UErrorCode& status);
inline UBool isLDHChar(UChar32 ch);
private:
private:
/**
* The address of this static class variable serves as this class's ID
* for ICU "poor man's RTTI".