organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-4072 Explicitly use U_EXPORT2 to specify calling convention of static C++ code.

Browse source 
X-SVN-Rev: 16182
This commit is contained in:
George Rhoten 2004-08-24 17:21:14 +00:00
parent b62e1c2a05
commit 254eea3c6e
30 changed files with 739 additions and 859 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
icu4c/source/common/brkiter.cpp
View file

@ -45,7 +45,7 @@ const int32_t BreakIterator::DONE = (int32_t)-1;
// -------------------------------------
// Creates a break iterator for word breaks.
BreakIterator*
BreakIterator* U_EXPORT2
BreakIterator::createWordInstance(const Locale& key, UErrorCode& status)
{
return createInstance(key, UBRK_WORD, status);
@ -98,7 +98,7 @@ BreakIterator::makeWordInstance(const Locale& key, UErrorCode& status)
// -------------------------------------
// Creates a break iterator for line breaks.
BreakIterator*
BreakIterator* U_EXPORT2
BreakIterator::createLineInstance(const Locale& key, UErrorCode& status)
{
return createInstance(key, UBRK_LINE, status);
@ -150,7 +150,7 @@ BreakIterator::makeLineInstance(const Locale& key, UErrorCode& status)
// -------------------------------------
// Creates a break iterator for character breaks.
BreakIterator*
BreakIterator* U_EXPORT2
BreakIterator::createCharacterInstance(const Locale& key, UErrorCode& status)
{
return createInstance(key, UBRK_CHARACTER, status);
@ -191,7 +191,7 @@ BreakIterator::makeCharacterInstance(const Locale& /* key */, UErrorCode& status
// -------------------------------------
// Creates a break iterator for sentence breaks.
BreakIterator*
BreakIterator* U_EXPORT2
BreakIterator::createSentenceInstance(const Locale& key, UErrorCode& status)
{
return createInstance(key, UBRK_SENTENCE, status);
@ -232,7 +232,7 @@ BreakIterator::makeSentenceInstance(const Locale& /*key */, UErrorCode& status)
// -------------------------------------
// Creates a break iterator for title casing breaks.
BreakIterator*
BreakIterator* U_EXPORT2
BreakIterator::createTitleInstance(const Locale& key, UErrorCode& status)
{
return createInstance(key, UBRK_TITLE, status);
@ -273,7 +273,7 @@ BreakIterator::makeTitleInstance(const Locale& /* key */, UErrorCode& status)
// -------------------------------------
// Gets all the available locales that has localized text boundary data.
const Locale*
const Locale* U_EXPORT2
BreakIterator::getAvailableLocales(int32_t& count)
{
return Locale::getAvailableLocales(count);
@ -281,7 +281,7 @@ BreakIterator::getAvailableLocales(int32_t& count)
// -------------------------------------
// Gets the objectLocale display name in the default locale language.
UnicodeString&
UnicodeString& U_EXPORT2
BreakIterator::getDisplayName(const Locale& objectLocale,
UnicodeString& name)
{
@ -290,7 +290,7 @@ BreakIterator::getDisplayName(const Locale& objectLocale,
// -------------------------------------
// Gets the objectLocale display name in the displayLocale language.
UnicodeString&
UnicodeString& U_EXPORT2
BreakIterator::getDisplayName(const Locale& objectLocale,
const Locale& displayLocale,
UnicodeString& name)
@ -394,7 +394,7 @@ hasService(void)
// -------------------------------------
URegistryKey
URegistryKey U_EXPORT2
BreakIterator::registerInstance(BreakIterator* toAdopt, const Locale& locale, UBreakIteratorType kind, UErrorCode& status)
{
return getService()->registerInstance(toAdopt, locale, kind, status);
@ -402,7 +402,7 @@ BreakIterator::registerInstance(BreakIterator* toAdopt, const Locale& locale, UB
// -------------------------------------
UBool
UBool U_EXPORT2
BreakIterator::unregister(URegistryKey key, UErrorCode& status)
{
if (U_SUCCESS(status)) {
@ -416,7 +416,7 @@ BreakIterator::unregister(URegistryKey key, UErrorCode& status)
// -------------------------------------
StringEnumeration*
StringEnumeration* U_EXPORT2
BreakIterator::getAvailableLocales(void)
{
return getService()->getAvailableLocales();

2
icu4c/source/common/caniter.cpp
View file

@ -309,7 +309,7 @@ void CanonicalIterator::setSource(const UnicodeString &newSource, UErrorCode &st
* @param source the string to find permutations for
* @return the results in a set.
*/
void CanonicalIterator::permute(UnicodeString &source, UBool skipZeros, Hashtable *result, UErrorCode &status) {
void U_EXPORT2 CanonicalIterator::permute(UnicodeString &source, UBool skipZeros, Hashtable *result, UErrorCode &status) {
if(U_FAILURE(status)) {
return;
}

8
icu4c/source/common/iculserv.cpp
View file

@ -859,9 +859,9 @@ public:
}
void reset(UErrorCode& status) {
if (status == U_ENUM_OUT_OF_SYNC_ERROR) {
status = U_ZERO_ERROR;
}
if (status == U_ENUM_OUT_OF_SYNC_ERROR) {
status = U_ZERO_ERROR;
}
if (U_SUCCESS(status)) {
_timestamp = _service->getTimestamp();
_pos = 0;
@ -870,7 +870,7 @@ public:
}
public:
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const;
};

8
icu4c/source/common/iculserv.h
View file

@ -154,7 +154,7 @@ class U_COMMON_API LocaleKey : public ICUServiceKey {
/**
* UObject boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const;
@ -274,7 +274,7 @@ public:
/**
* UObject boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const;
@ -338,7 +338,7 @@ public:
/**
* UObject boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const;
@ -401,7 +401,7 @@ public:
/**
* UObject boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const;

2
icu4c/source/common/icunotif.h
View file

@ -36,7 +36,7 @@ public:
virtual ~EventListener();
public:
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const;

6
icu4c/source/common/icuserv.h
View file

@ -183,7 +183,7 @@ public:
/**
* UObject RTTI boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* UObject RTTI boilerplate.
@ -337,7 +337,7 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory {
/**
* UObject RTTI boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* UObject RTTI boilerplate.
@ -378,7 +378,7 @@ public:
/**
* UObject RTTI boilerplate.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* UObject RTTI boilerplate.

58
icu4c/source/common/locid.cpp
View file

@ -635,7 +635,7 @@ Locale::setToBogus() {
fIsBogus = TRUE;
}
const Locale&
const Locale& U_EXPORT2
Locale::getDefault()
{
const Locale *retLocale;
@ -657,7 +657,7 @@ Locale::getDefault()
void
void U_EXPORT2
Locale::setDefault( const Locale& newLocale,
UErrorCode& status)
{
@ -672,7 +672,7 @@ Locale::setDefault( const Locale& newLocale,
locale_set_default_internal(localeID);
}
Locale
Locale U_EXPORT2
Locale::createFromName (const char *name)
{
if (name) {
@ -685,7 +685,7 @@ Locale::createFromName (const char *name)
}
}
Locale
Locale U_EXPORT2
Locale::createCanonical(const char* name) {
Locale loc("");
loc.init(name, TRUE);
@ -943,7 +943,7 @@ Locale::getDisplayName(const Locale &displayLocale,
return result;
}
const Locale*
const Locale* U_EXPORT2
Locale::getAvailableLocales(int32_t& count)
{
// for now, there is a hardcoded list, so just walk through that list and set it up.
@ -980,12 +980,12 @@ Locale::getAvailableLocales(int32_t& count)
return availableLocaleList;
}
const char* const* Locale::getISOCountries()
const char* const* U_EXPORT2 Locale::getISOCountries()
{
return uloc_getISOCountries();
}
const char* const* Locale::getISOLanguages()
const char* const* U_EXPORT2 Locale::getISOLanguages()
{
return uloc_getISOLanguages();
}
@ -996,128 +996,128 @@ void Locale::setFromPOSIXID(const char *posixID)
init(posixID, TRUE);
}
const Locale &
const Locale & U_EXPORT2
Locale::getEnglish(void)
{
return getLocale(eENGLISH);
}
const Locale &
const Locale & U_EXPORT2
Locale::getFrench(void)
{
return getLocale(eFRENCH);
}
const Locale &
const Locale & U_EXPORT2
Locale::getGerman(void)
{
return getLocale(eGERMAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getItalian(void)
{
return getLocale(eITALIAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getJapanese(void)
{
return getLocale(eJAPANESE);
}
const Locale &
const Locale & U_EXPORT2
Locale::getKorean(void)
{
return getLocale(eKOREAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getChinese(void)
{
return getLocale(eCHINESE);
}
const Locale &
const Locale & U_EXPORT2
Locale::getSimplifiedChinese(void)
{
return getLocale(eCHINA);
}
const Locale &
const Locale & U_EXPORT2
Locale::getTraditionalChinese(void)
{
return getLocale(eTAIWAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getFrance(void)
{
return getLocale(eFRANCE);
}
const Locale &
const Locale & U_EXPORT2
Locale::getGermany(void)
{
return getLocale(eGERMANY);
}
const Locale &
const Locale & U_EXPORT2
Locale::getItaly(void)
{
return getLocale(eITALY);
}
const Locale &
const Locale & U_EXPORT2
Locale::getJapan(void)
{
return getLocale(eJAPAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getKorea(void)
{
return getLocale(eKOREA);
}
const Locale &
const Locale & U_EXPORT2
Locale::getChina(void)
{
return getLocale(eCHINA);
}
const Locale &
const Locale & U_EXPORT2
Locale::getPRC(void)
{
return getLocale(eCHINA);
}
const Locale &
const Locale & U_EXPORT2
Locale::getTaiwan(void)
{
return getLocale(eTAIWAN);
}
const Locale &
const Locale & U_EXPORT2
Locale::getUK(void)
{
return getLocale(eUK);
}
const Locale &
const Locale & U_EXPORT2
Locale::getUS(void)
{
return getLocale(eUS);
}
const Locale &
const Locale & U_EXPORT2
Locale::getCanada(void)
{
return getLocale(eCANADA);
}
const Locale &
const Locale & U_EXPORT2
Locale::getCanadaFrench(void)
{
return getLocale(eCANADA_FRENCH);
@ -1193,7 +1193,7 @@ private:
static const char fgClassID;/* Warning this is used beyond the typical RTTI usage. */
public:
static UClassID getStaticClassID(void) { return (UClassID)&fgClassID; }
static UClassID U_EXPORT2 getStaticClassID(void) { return (UClassID)&fgClassID; }
virtual UClassID getDynamicClassID(void) const { return getStaticClassID(); }
public:
KeywordEnumeration(const char *keys, int32_t keywordLen, int32_t currentIndex, UErrorCode &status)

8
icu4c/source/common/normlzr.cpp
View file

@ -120,7 +120,7 @@ UBool Normalizer::operator==(const Normalizer& that) const
// Static utility methods
//-------------------------------------------------------------------------
void
void U_EXPORT2
Normalizer::normalize(const UnicodeString& source,
UNormalizationMode mode, int32_t options,
UnicodeString& result,
@ -166,7 +166,7 @@ Normalizer::normalize(const UnicodeString& source,
}
}
void
void U_EXPORT2
Normalizer::compose(const UnicodeString& source,
UBool compat, int32_t options,
UnicodeString& result,
@ -212,7 +212,7 @@ Normalizer::compose(const UnicodeString& source,
}
}
void
void U_EXPORT2
Normalizer::decompose(const UnicodeString& source,
UBool compat, int32_t options,
UnicodeString& result,
@ -258,7 +258,7 @@ Normalizer::decompose(const UnicodeString& source,
}
}
UnicodeString &
UnicodeString & U_EXPORT2
Normalizer::concatenate(UnicodeString &left, UnicodeString &right,
UnicodeString &result,
UNormalizationMode mode, int32_t options,

45
icu4c/source/common/unicode/brkiter.h
View file

@ -377,8 +377,8 @@ public:
* The caller owns the returned object and is responsible for deleting it.
* @stable ICU 2.0
*/
static BreakIterator* createWordInstance(const Locale& where,
UErrorCode& status);
static BreakIterator* U_EXPORT2
createWordInstance(const Locale& where, UErrorCode& status);
/**
* Create BreakIterator for line-breaks using specified locale.
@ -401,8 +401,8 @@ public:
* The caller owns the returned object and is responsible for deleting it.
* @stable ICU 2.0
*/
static BreakIterator* createLineInstance(const Locale& where,
UErrorCode& status);
static BreakIterator* U_EXPORT2
createLineInstance(const Locale& where, UErrorCode& status);
/**
* Create BreakIterator for character-breaks using specified locale
@ -423,8 +423,8 @@ public:
* The caller owns the returned object and is responsible for deleting it.
* @stable ICU 2.0
*/
static BreakIterator* createCharacterInstance(const Locale& where,
UErrorCode& status);
static BreakIterator* U_EXPORT2
createCharacterInstance(const Locale& where, UErrorCode& status);
/**
* Create BreakIterator for sentence-breaks using specified locale
@ -444,13 +444,13 @@ public:
* The caller owns the returned object and is responsible for deleting it.
* @stable ICU 2.0
*/
static BreakIterator* createSentenceInstance(const Locale& where,
UErrorCode& status);
static BreakIterator* U_EXPORT2
createSentenceInstance(const Locale& where, UErrorCode& status);
/**
* Create BreakIterator for title-casing breaks using the specified locale
* Returns an instance of a BreakIterator implementing title breaks.
* The iterator returned locates title boundaries as described for
* The iterator returned locates title boundaries as described for
* Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
* please use Word Boundary iterator.{@link #createWordInstance }
*
@ -469,8 +469,8 @@ public:
* The caller owns the returned object and is responsible for deleting it.
* @stable ICU 2.1
*/
static BreakIterator* createTitleInstance(const Locale& where,
UErrorCode& status);
static BreakIterator* U_EXPORT2
createTitleInstance(const Locale& where, UErrorCode& status);
/**
* Get the set of Locales for which TextBoundaries are installed.
@ -481,7 +481,7 @@ public:
* @return available locales
* @stable ICU 2.0
*/
static const Locale* getAvailableLocales(int32_t& count);
static const Locale* U_EXPORT2 getAvailableLocales(int32_t& count);
/**
* Get name of the object for the desired Locale, in the desired langauge.
@ -492,7 +492,7 @@ public:
* @return user-displayable name
* @stable ICU 2.0
*/
static UnicodeString& getDisplayName(const Locale& objectLocale,
static UnicodeString& U_EXPORT2 getDisplayName(const Locale& objectLocale,
const Locale& displayLocale,
UnicodeString& name);
@ -504,7 +504,7 @@ public:
* @return user-displayable name
* @stable ICU 2.0
*/
static UnicodeString& getDisplayName(const Locale& objectLocale,
static UnicodeString& U_EXPORT2 getDisplayName(const Locale& objectLocale,
UnicodeString& name);
/**
@ -549,7 +549,10 @@ public:
* @return a registry key that can be used to unregister this instance
* @stable ICU 2.4
*/
static URegistryKey registerInstance(BreakIterator* toAdopt, const Locale& locale, UBreakIteratorType kind, UErrorCode& status);
static URegistryKey U_EXPORT2 registerInstance(BreakIterator* toAdopt,
const Locale& locale,
UBreakIteratorType kind,
UErrorCode& status);
/**
* Unregister a previously-registered BreakIterator using the key returned from the
@ -560,26 +563,26 @@ public:
* @return TRUE if the iterator for the key was successfully unregistered
* @stable ICU 2.4
*/
static UBool unregister(URegistryKey key, UErrorCode& status);
static UBool U_EXPORT2 unregister(URegistryKey key, UErrorCode& status);
/**
* Return a StringEnumeration over the locales available at the time of the call,
* Return a StringEnumeration over the locales available at the time of the call,
* including registered locales.
* @return a StringEnumeration over the locales available at the time of the call
* @stable ICU 2.4
*/
static StringEnumeration* getAvailableLocales(void);
static StringEnumeration* U_EXPORT2 getAvailableLocales(void);
#endif
/**
* Returns the locale for this break iterator. Two flavors are available: valid and
* actual locale.
* Returns the locale for this break iterator. Two flavors are available: valid and
* actual locale.
* @draft ICU 2.8 likely to change in ICU 3.0, based on feedback
*/
Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
/** Get the locale for this break iterator object. You can choose between valid and actual locale.
* @param type type of the locale we're looking for (valid or actual)
* @param type type of the locale we're looking for (valid or actual)
* @param status error code for the operation
* @return the locale
* @internal

36
icu4c/source/common/unicode/caniter.h
View file

@ -70,7 +70,7 @@ public:
* @param status Fill-in parameter which receives the status of this operation.
* @stable ICU 2.4
*/
CanonicalIterator(const UnicodeString &source, UErrorCode &status);
CanonicalIterator(const UnicodeString &source, UErrorCode &status);
/** Destructor
* Cleans pieces
@ -83,13 +83,13 @@ public:
* @return gets the source: NOTE: it is the NFD form of source
* @stable ICU 2.4
*/
UnicodeString getSource();
UnicodeString getSource();
/**
* Resets the iterator so that one can start again from the beginning.
* @stable ICU 2.4
*/
void reset();
void reset();
/**
* Get the next canonically equivalent string.
@ -98,7 +98,7 @@ public:
* the iteration is done.
* @stable ICU 2.4
*/
UnicodeString next();
UnicodeString next();
/**
* Set a new source for this iterator. Allows object reuse.
@ -107,25 +107,25 @@ public:
* @param status Fill-in parameter which receives the status of this operation.
* @stable ICU 2.4
*/
void setSource(const UnicodeString &newSource, UErrorCode &status);
void setSource(const UnicodeString &newSource, UErrorCode &status);
/**
* Dumb recursive implementation of permutation.
* Dumb recursive implementation of permutation.
* TODO: optimize
* @param source the string to find permutations for
* @param skipZeros determine if skip zeros
* @param result the results in a set.
* @param status Fill-in parameter which receives the status of this operation.
* @internal
* @internal
*/
static void permute(UnicodeString &source, UBool skipZeros, Hashtable *result, UErrorCode &status);
static void U_EXPORT2 permute(UnicodeString &source, UBool skipZeros, Hashtable *result, UErrorCode &status);
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -137,8 +137,8 @@ public:
private:
// ===================== PRIVATES ==============================
// private default constructor
CanonicalIterator();
CanonicalIterator();
/**
* Copy constructor. Private for now.
@ -165,21 +165,21 @@ private:
// current is used in iterating to combine pieces
int32_t *current;
int32_t current_length;
// transient fields
UnicodeString buffer;
// we have a segment, in NFD. Find all the strings that are canonically equivalent to it.
UnicodeString *getEquivalents(const UnicodeString &segment, int32_t &result_len, UErrorCode &status); //private String[] getEquivalents(String segment)
//Set getEquivalents2(String segment);
Hashtable *getEquivalents2(const UChar *segment, int32_t segLen, UErrorCode &status);
//Hashtable *getEquivalents2(const UnicodeString &segment, int32_t segLen, UErrorCode &status);
/**
* See if the decomposition of cp2 is at segment starting at segmentPos
* See if the decomposition of cp2 is at segment starting at segmentPos
* (with canonical rearrangment!)
* If so, take the remainder, and return the equivalents
* If so, take the remainder, and return the equivalents
*/
//Set extract(int comp, String segment, int segmentPos, StringBuffer buffer);
Hashtable *extract(UChar32 comp, const UChar *segment, int32_t segLen, int32_t segmentPos, UErrorCode &status);

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

@ -57,7 +57,7 @@ class DictionaryBasedBreakIteratorTables;
* currently making it public. Contact us for help.
* <p>
* <b> NOTE </b> The DictionaryBasedIterator class is still under development. The
* APIs are not in stable condition yet.
* APIs are not in stable condition yet.
*/
class U_COMMON_API DictionaryBasedBreakIterator : public RuleBasedBreakIterator {
@ -85,11 +85,11 @@ private:
DictionaryBasedBreakIteratorTables *fTables;
/**=======================================================================
* Create a dictionary based break boundary detection iterator.
* Create a dictionary based break boundary detection iterator.
* @param tablesImage The location for the dictionary to be loaded into memory
* @param dictionaryFilename The name of the dictionary file
* @param dictionaryFilename The name of the dictionary file
* @param status the error code status
* @return A dictionary based break detection iterator. The UErrorCode& status
* @return A dictionary based break detection iterator. The UErrorCode& status
* parameter is used to return status information to the user.
* To check whether the construction succeeded or not, you should check
* the value of U_SUCCESS(err). If you wish more detailed information, you
@ -127,7 +127,7 @@ public:
DictionaryBasedBreakIterator(const DictionaryBasedBreakIterator &other);
/**
* Assignment operator.
* Assignment operator.
* @param that The object to be copied.
* @return the newly set DictionaryBasedBreakIterator.
* @stable ICU 2.0
@ -181,7 +181,7 @@ public:
* @return The class ID for all objects of this class.
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override.
@ -224,15 +224,15 @@ protected:
void init();
/**
* @param stackBuffer user allocated space for the new clone. If NULL new memory will be allocated.
* @param stackBuffer user allocated space for the new clone. If NULL new memory will be allocated.
* If buffer is not large enough, new memory will be allocated.
* @param BufferSize reference to size of allocated space.
* If BufferSize == 0, a sufficient size for use in cloning will
* @param BufferSize reference to size of allocated space.
* If BufferSize == 0, a sufficient size for use in cloning will
* be returned ('pre-flighting')
* If BufferSize is not enough for a stack-based safe clone,
* If BufferSize is not enough for a stack-based safe clone,
* new memory will be allocated.
* @param status to indicate whether the operation went on smoothly or there were errors
* An informational status value, U_SAFECLONE_ALLOCATED_ERROR, is used if any allocations were
* An informational status value, U_SAFECLONE_ALLOCATED_ERROR, is used if any allocations were
* necessary.
* @return pointer to the new clone
* @internal

123
icu4c/source/common/unicode/locid.h
View file

@ -53,29 +53,29 @@
* The Locale class is not suitable for subclassing.
*
* <P>
* You create a <code>Locale</code> object using the constructor in
* You can create a <code>Locale</code> object using the constructor in
* this class:
* \htmlonly<blockquote>\endhtmlonly
* <pre>
* . Locale( const char* language,
* . const char* country,
* . Locale( const char* language,
* . const char* country,
* . const char* variant);
* </pre>
* \htmlonly</blockquote>\endhtmlonly
* The first argument to the constructors is a valid <STRONG>ISO
* Language Code.</STRONG> These codes are the lower-case two-letter
* codes as defined by ISO-639.
* You can find a full list of these codes at a number of sites, such as:
* <BR><a href ="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">
* http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a>
* You can find a full list of these codes at:
* <BR><a href ="http://www.loc.gov/standards/iso639-2/">
* http://www.loc.gov/standards/iso639-2/</a>
*
* <P>
* The second argument to the constructors is a valid <STRONG>ISO Country
* Code.</STRONG> These codes are the upper-case two-letter codes
* as defined by ISO-3166.
* You can find a full list of these codes at a number of sites, such as:
* <BR><a href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html">
* http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a>
* <BR><a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html">
* http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html</a>
*
* <P>
* The third constructor requires a third argument--the <STRONG>Variant.</STRONG>
@ -123,7 +123,7 @@
* a language appropriate to that locale.
*
* <P>
* The TIFC provides a number of classes that perform locale-sensitive
* ICU provides a number of classes that perform locale-sensitive
* operations. For example, the <code>NumberFormat</code> class formats
* numbers, currency, or percentages in a locale-sensitive manner. Classes
* such as <code>NumberFormat</code> have a number of convenience methods
@ -135,7 +135,7 @@
* UErrorCode success = U_ZERO_ERROR;
* Locale myLocale;
* NumberFormat *nf;
*
*
* nf = NumberFormat::createInstance( success ); delete nf;
* nf = NumberFormat::createCurrencyInstance( success ); delete nf;
* nf = NumberFormat::createPercentInstance( success ); delete nf;
@ -181,48 +181,48 @@ U_NAMESPACE_BEGIN
class U_COMMON_API Locale : public UObject {
public:
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getEnglish(void);
static const Locale &U_EXPORT2 getEnglish(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getFrench(void);
static const Locale &U_EXPORT2 getFrench(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getGerman(void);
static const Locale &U_EXPORT2 getGerman(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getItalian(void);
static const Locale &U_EXPORT2 getItalian(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getJapanese(void);
static const Locale &U_EXPORT2 getJapanese(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getKorean(void);
static const Locale &U_EXPORT2 getKorean(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getChinese(void);
static const Locale &U_EXPORT2 getChinese(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getSimplifiedChinese(void);
static const Locale &U_EXPORT2 getSimplifiedChinese(void);
/** Useful constant for this language. @stable ICU 2.0 */
static const Locale &getTraditionalChinese(void);
static const Locale &U_EXPORT2 getTraditionalChinese(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getFrance(void);
static const Locale &U_EXPORT2 getFrance(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getGermany(void);
static const Locale &U_EXPORT2 getGermany(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getItaly(void);
static const Locale &U_EXPORT2 getItaly(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getJapan(void);
static const Locale &U_EXPORT2 getJapan(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getKorea(void);
static const Locale &U_EXPORT2 getKorea(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getChina(void);
static const Locale &U_EXPORT2 getChina(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getPRC(void);
static const Locale &U_EXPORT2 getPRC(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getTaiwan(void);
static const Locale &U_EXPORT2 getTaiwan(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getUK(void);
static const Locale &U_EXPORT2 getUK(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getUS(void);
static const Locale &U_EXPORT2 getUS(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getCanada(void);
static const Locale &U_EXPORT2 getCanada(void);
/** Useful constant for this country/region. @stable ICU 2.0 */
static const Locale &getCanadaFrench(void);
static const Locale &U_EXPORT2 getCanadaFrench(void);
/**
@ -232,7 +232,7 @@ public:
* @see uloc_getDefault
* @stable ICU 2.0
*/
Locale();
Locale();
/**
* Construct a locale from language, country, variant.
@ -245,9 +245,9 @@ public:
* This parameter can be NULL; if so,
* the locale is initialized to match the current default locale.
* (This is the same as using the default constructor.)
* Please note: The Java Locale class does NOT accept the form
* Please note: The Java Locale class does NOT accept the form
* 'new Locale("en_US")' but only 'new Locale("en","US")'
*
*
* @param country Uppercase two-letter ISO-3166 code. (optional)
* @param variant Uppercase vendor and browser specific code. See class
* description. (optional)
@ -259,7 +259,7 @@ public:
* @stable ICU 2.0
*/
Locale( const char * language,
const char * country = 0,
const char * country = 0,
const char * variant = 0,
const char * keywordsAndValues = 0);
@ -334,7 +334,7 @@ public:
* @system
* @stable ICU 2.0
*/
static const Locale& getDefault(void);
static const Locale& U_EXPORT2 getDefault(void);
/**
* Sets the default. Normally set once at the beginning of a process,
@ -348,20 +348,19 @@ public:
* @system
* @stable ICU 2.0
*/
static void setDefault(const Locale& newLocale,
UErrorCode& success);
static void U_EXPORT2 setDefault(const Locale& newLocale,
UErrorCode& success);
/**
* Creates a locale which has had minimal canonicalization
* as per uloc_getName().
* Creates a locale which has had minimal canonicalization
* as per uloc_getName().
* @param name The name to create from. If name is null,
* the default Locale is used.
* @return new locale object
* @stable ICU 2.0
* @see uloc_getName
*/
static Locale createFromName(const char *name);
static Locale U_EXPORT2 createFromName(const char *name);
/**
* Creates a locale from the given string after canonicalizing
@ -371,8 +370,8 @@ public:
* @draft ICU 3.0
* @see uloc_canonicalize
*/
static Locale createCanonical(const char* name);
static Locale U_EXPORT2 createCanonical(const char* name);
/**
* Returns the locale's ISO-639 language code.
* @return An alias to the code
@ -424,7 +423,7 @@ public:
/**
* Gets the list of keywords for the specified locale.
* Gets the list of keywords for the specified locale.
*
* @return pointer to StringEnumeration class. Client must dispose of it by calling delete.
* @param status Returns any error information while performing this operation.
@ -433,8 +432,8 @@ public:
StringEnumeration * createKeywords(UErrorCode &status) const;
/**
* Get the value for a keyword.
*
* Get the value for a keyword.
*
* @param keywordName name of the keyword for which we want the value. Case insensitive.
* @param status Returns any error information while performing this operation.
* @param buffer The buffer to receive the keyword value.
@ -443,7 +442,7 @@ public:
*
* @draft ICU 2.8
*/
int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const;
int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const;
/**
* returns the locale's three-letter language code, as specified
@ -573,7 +572,7 @@ public:
UnicodeString& dispVar) const;
/**
* Fills in "name" with the name of this locale in a format suitable for user display
* Fills in "name" with the name of this locale in a format suitable for user display
* in the default locale. This function uses getDisplayLanguage(), getDisplayCountry(),
* and getDisplayVariant() to do its work, and outputs the display name in the format
* "language (country[,variant])". For example, if the default locale is en_US, then
@ -586,7 +585,7 @@ public:
UnicodeString& getDisplayName( UnicodeString& name) const;
/**
* Fills in "name" with the name of this locale in a format suitable for user display
* Fills in "name" with the name of this locale in a format suitable for user display
* in the locale specfied by "displayLocale". This function uses getDisplayLanguage(),
* getDisplayCountry(), and getDisplayVariant() to do its work, and outputs the display
* name in the format "language (country[,variant])". For example, if displayLocale is
@ -606,12 +605,12 @@ public:
*/
int32_t hashCode(void) const;
/**
* Sets the locale to bogus
* A bogus locale represents a non-existing locale associated
* with services that can be instantiated from non-locale data
* in addition to locale (for example, collation can be
* instantiated from a locale and from a rule set).
/**
* Sets the locale to bogus
* A bogus locale represents a non-existing locale associated
* with services that can be instantiated from non-locale data
* in addition to locale (for example, collation can be
* instantiated from a locale and from a rule set).
* @stable ICU 2.1
*/
void setToBogus();
@ -631,7 +630,7 @@ public:
* get ownership of this list, and must NOT delete it.
* @stable ICU 2.0
*/
static const Locale* getAvailableLocales(int32_t& count);
static const Locale* U_EXPORT2 getAvailableLocales(int32_t& count);
/**
* Gets a list of all available 2-letter country codes defined in ISO 639. This is a
@ -641,7 +640,7 @@ public:
* @return a list of all available country codes
* @stable ICU 2.0
*/
static const char* const* getISOCountries();
static const char* const* U_EXPORT2 getISOCountries();
/**
* Gets a list of all available language codes defined in ISO 639. This is a pointer
@ -651,14 +650,14 @@ public:
* @return a list of all available language codes
* @stable ICU 2.0
*/
static const char* const* getISOLanguages();
static const char* const* U_EXPORT2 getISOLanguages();
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -749,13 +748,13 @@ Locale::getVariant() const
return &fullName[variantBegin];
}
inline const char *
inline const char *
Locale::getName() const
{
return fullName;
}
inline UBool
inline UBool
Locale::isBogus(void) const {
return fIsBogus;
}

38
icu4c/source/common/unicode/normlzr.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************
* COPYRIGHT:
* COPYRIGHT:
* Copyright (c) 1996-2004, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
@ -23,7 +23,7 @@ typedef struct UCharIterator UCharIterator; /**< C typedef for struct UCharItera
U_NAMESPACE_BEGIN
/**
* \brief C++ API: Unicode Normalization
* \brief C++ API: Unicode Normalization
*
* The Normalizer class consists of two parts:
* - static functions that normalize strings or test if strings are normalized
@ -136,7 +136,7 @@ public:
* @stable ICU 2.0
*/
Normalizer(const UnicodeString& str, UNormalizationMode mode);
/**
* Creates a new <code>Normalizer</code> object for iterating over the
* normalized form of a given string.
@ -194,7 +194,7 @@ public:
* @param status The error code.
* @stable ICU 2.0
*/
static void normalize(const UnicodeString& source,
static void U_EXPORT2 normalize(const UnicodeString& source,
UNormalizationMode mode, int32_t options,
UnicodeString& result,
UErrorCode &status);
@ -216,7 +216,7 @@ public:
* @param status The error code.
* @stable ICU 2.0
*/
static void compose(const UnicodeString& source,
static void U_EXPORT2 compose(const UnicodeString& source,
UBool compat, int32_t options,
UnicodeString& result,
UErrorCode &status);
@ -238,22 +238,22 @@ public:
* @param status The error code.
* @stable ICU 2.0
*/
static void decompose(const UnicodeString& source,
static void U_EXPORT2 decompose(const UnicodeString& source,
UBool compat, int32_t options,
UnicodeString& result,
UErrorCode &status);
/**
* Performing quick check on a string, to quickly determine if the string is
* Performing quick check on a string, to quickly determine if the string is
* in a particular normalization format.
* This is a wrapper for unorm_quickCheck(), using a UnicodeString.
*
* Three types of result can be returned UNORM_YES, UNORM_NO or
* UNORM_MAYBE. Result UNORM_YES indicates that the argument
* string is in the desired normalized format, UNORM_NO determines that
* argument string is not in the desired normalized format. A
* UNORM_MAYBE result indicates that a more thorough check is required,
* the user may have to put the string in its normalized form and compare the
* argument string is not in the desired normalized format. A
* UNORM_MAYBE result indicates that a more thorough check is required,
* the user may have to put the string in its normalized form and compare the
* results.
* @param source string for determining if it is in a normalized format
* @param mode normalization format
@ -353,7 +353,7 @@ public:
* @stable ICU 2.1
*/
static UnicodeString &
concatenate(UnicodeString &left, UnicodeString &right,
U_EXPORT2 concatenate(UnicodeString &left, UnicodeString &right,
UnicodeString &result,
UNormalizationMode mode, int32_t options,
UErrorCode &errorCode);
@ -430,7 +430,7 @@ public:
//-------------------------------------------------------------------------
// Iteration API
//-------------------------------------------------------------------------
/**
* Return the current character in the normalized text.
* current() may need to normalize some text at getIndex().
@ -572,7 +572,7 @@ public:
/**
* Returns a pointer to a new Normalizer that is a clone of this one.
* The caller is responsible for deleting the new clone.
* @return a pointer to a new Normalizer
* @return a pointer to a new Normalizer
* @stable ICU 2.0
*/
Normalizer* clone(void) const;
@ -634,7 +634,7 @@ public:
* @see #getOption
* @stable ICU 2.0
*/
void setOption(int32_t option,
void setOption(int32_t option,
UBool value);
/**
@ -657,7 +657,7 @@ public:
* @param status a UErrorCode
* @stable ICU 2.0
*/
void setText(const UnicodeString& newText,
void setText(const UnicodeString& newText,
UErrorCode &status);
/**
@ -668,7 +668,7 @@ public:
* @param status a UErrorCode
* @stable ICU 2.0
*/
void setText(const CharacterIterator& newText,
void setText(const CharacterIterator& newText,
UErrorCode &status);
/**
@ -696,7 +696,7 @@ public:
* @returns a UClassID for this class.
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -751,7 +751,7 @@ Normalizer::operator!= (const Normalizer& other) const
inline UNormalizationCheckResult
Normalizer::quickCheck(const UnicodeString& source,
UNormalizationMode mode,
UNormalizationMode mode,
UErrorCode &status) {
if(U_FAILURE(status)) {
return UNORM_MAYBE;
@ -775,7 +775,7 @@ Normalizer::quickCheck(const UnicodeString& source,
inline UBool
Normalizer::isNormalized(const UnicodeString& source,
UNormalizationMode mode,
UNormalizationMode mode,
UErrorCode &status) {
if(U_FAILURE(status)) {
return FALSE;

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

@ -149,7 +149,7 @@ public:
*
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.

20
icu4c/source/common/unicode/rbbi.h
View file

@ -44,7 +44,7 @@ struct RBBIStateTable;
* <p>See the ICU User Guide for information on Break Iterator Rules.</p>
*
* <p>This class is not intended to be subclassed. (Class DictionaryBasedBreakIterator
* is a subclass, but that relationship is effectively internal to the ICU
* is a subclass, but that relationship is effectively internal to the ICU
* implementation. The subclassing interface to RulesBasedBreakIterator is
* not part of the ICU API, and may not remain stable.</p>
*
@ -64,7 +64,7 @@ protected:
*/
RBBIDataWrapper *fData;
/** Index of the Rule {tag} values for the most recent match.
/** Index of the Rule {tag} values for the most recent match.
* @internal
*/
int32_t fLastRuleStatusIndex;
@ -146,7 +146,7 @@ public:
/**
* This constructor uses the udata interface to create a BreakIterator
* whose internal tables live in a memory-mapped file. "image" is an
* whose internal tables live in a memory-mapped file. "image" is an
* ICU UDataMemory handle for the pre-compiled break iterator tables.
* @param image handle to the memory image for the break iterator data.
* Ownership of the UDataMemory handle passes to the Break Iterator,
@ -344,7 +344,7 @@ public:
* and soft (potential) break positions.
* <p>
* <code>getRuleStatus()</code> can be called after obtaining a boundary
* position from <code>next()</code>, <code>previous()</code>, or
* position from <code>next()</code>, <code>previous()</code>, or
* any other break iterator functions that returns a boundary position.
* <p>
* When creating custom break rules, one is free to define whatever
@ -363,8 +363,8 @@ public:
virtual int32_t getRuleStatus() const;
/**
* Get the status (tag) values from the break rule(s) that determined the most
* recently returned break position.
* Get the status (tag) values from the break rule(s) that determined the most
* recently returned break position.
* <p>
* The returned status value(s) are stored into an array provided by the caller.
* The values are stored in sorted (ascending) order.
@ -372,12 +372,12 @@ public:
* the output will be truncated to the available length, and a
* U_BUFFER_OVERFLOW_ERROR will be signaled.
*
* @param fillInVec an array to be filled in with the status values.
* @param fillInVec an array to be filled in with the status values.
* @param capacity the length of the supplied vector. A length of zero causes
* the function to return the number of status values, in the
* normal way, without attemtping to store any values.
* @param status receives error codes.
* @return The number of rule status values from rules that determined
* @param status receives error codes.
* @return The number of rule status values from rules that determined
* the most recent boundary returned by the break iterator.
* In the event of a U_BUFFER_OVERFLOW_ERROR, the return value
* is the total number of status values that were available,
@ -411,7 +411,7 @@ public:
* @return The class ID for all objects of this class.
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
/*
* Create a clone (copy) of this break iterator in memory provided

98
icu4c/source/common/unicode/resbund.h
View file

@ -45,7 +45,7 @@
#ifndef RESBUND_H
#define RESBUND_H
#include "unicode/utypes.h"
#include "unicode/uobject.h"
#include "unicode/ures.h"
@ -62,7 +62,7 @@ U_NAMESPACE_BEGIN
* <P>
* Resource bundles in ICU4C are currently defined using text files which conform to the following
* <a href="http://oss.software.ibm.com/cvs/icu/~checkout~/icuhtml/design/bnf_rb.txt">BNF definition</a>.
* More on resource bundle concepts and syntax can be found in the
* More on resource bundle concepts and syntax can be found in the
* <a href="http://oss.software.ibm.com/icu/userguide/ResourceManagement.html">Users Guide</a>.
* <P>
*
@ -151,7 +151,7 @@ public:
* @param status A UErrorCode value.
* @stable ICU 2.0
*/
ResourceBundle(UResourceBundle *res,
ResourceBundle(UResourceBundle *res,
UErrorCode &status);
/**
@ -160,10 +160,10 @@ public:
* @param other The resource bundle to copy.
* @stable ICU 2.0
*/
ResourceBundle&
ResourceBundle&
operator=(const ResourceBundle& other);
/** Destructor.
/** Destructor.
* @stable ICU 2.0
*/
~ResourceBundle();
@ -184,14 +184,14 @@ public:
/**
* Returns the size of a resource. Size for scalar types is always 1, and for vector/table types is
* the number of child resources.
* @warning Integer array is treated as a scalar type. There are no
* @warning Integer array is treated as a scalar type. There are no
* APIs to access individual members of an integer array. It
* is always returned as a whole.
*
* @return number of resources in a given resource.
* @stable ICU 2.0
*/
int32_t
int32_t
getSize(void) const;
/**
@ -199,12 +199,12 @@ public:
*
* @param status fills in the outgoing error code
* could be <TT>U_MISSING_RESOURCE_ERROR</TT> if the key is not found
* could be a warning
* could be a warning
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a pointer to a zero-terminated UChar array which lives in a memory mapped/DLL file.
* @stable ICU 2.0
*/
UnicodeString
UnicodeString
getString(UErrorCode& status) const;
/**
@ -214,7 +214,7 @@ public:
* @param len fills in the length of resulting byte chunk
* @param status fills in the outgoing error code
* could be <TT>U_MISSING_RESOURCE_ERROR</TT> if the key is not found
* could be a warning
* could be a warning
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a pointer to a chunk of unsigned bytes which live in a memory mapped/DLL file.
* @stable ICU 2.0
@ -224,12 +224,12 @@ public:
/**
* returns an integer vector from a resource.
* returns an integer vector from a resource.
*
* @param len fills in the length of resulting integer vector
* @param status fills in the outgoing error code
* could be <TT>U_MISSING_RESOURCE_ERROR</TT> if the key is not found
* could be a warning
* could be a warning
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a pointer to a vector of integers that lives in a memory mapped/DLL file.
* @stable ICU 2.0
@ -238,31 +238,31 @@ public:
getIntVector(int32_t& len, UErrorCode& status) const;
/**
* returns an unsigned integer from a resource.
* returns an unsigned integer from a resource.
* This integer is originally 28 bits.
*
* @param status fills in the outgoing error code
* could be <TT>U_MISSING_RESOURCE_ERROR</TT> if the key is not found
* could be a warning
* could be a warning
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return an unsigned integer value
* @stable ICU 2.0
*/
uint32_t
uint32_t
getUInt(UErrorCode& status) const;
/**
* returns a signed integer from a resource.
* returns a signed integer from a resource.
* This integer is originally 28 bit and the sign gets propagated.
*
* @param status fills in the outgoing error code
* could be <TT>U_MISSING_RESOURCE_ERROR</TT> if the key is not found
* could be a warning
* could be a warning
* e.g.: <TT>U_USING_FALLBACK_WARNING</TT>,<TT>U_USING_DEFAULT_WARNING </TT>
* @return a signed integer value
* @stable ICU 2.0
*/
int32_t
int32_t
getInt(UErrorCode& status) const;
/**
@ -271,7 +271,7 @@ public:
* @return TRUE if there are more elements, FALSE if there is no more elements
* @stable ICU 2.0
*/
UBool
UBool
hasNext(void) const;
/**
@ -279,11 +279,11 @@ public:
*
* @stable ICU 2.0
*/
void
void
resetIterator(void);
/**
* Returns the key associated with this resource. Not all the resources have a key - only
* Returns the key associated with this resource. Not all the resources have a key - only
* those that are members of a table.
*
* @return a key associated to this resource, or NULL if it doesn't have a key
@ -309,53 +309,53 @@ public:
* @return type of the given resource.
* @stable ICU 2.0
*/
UResType
UResType
getType(void) const;
/**
* Returns the next resource in a given resource or NULL if there are no more resources
* Returns the next resource in a given resource or NULL if there are no more resources
*
* @param status fills in the outgoing error code
* @return ResourceBundle object.
* @stable ICU 2.0
*/
ResourceBundle
ResourceBundle
getNext(UErrorCode& status);
/**
* Returns the next string in a resource or NULL if there are no more resources
* to iterate over.
* Returns the next string in a resource or NULL if there are no more resources
* to iterate over.
*
* @param status fills in the outgoing error code
* @return an UnicodeString object.
* @stable ICU 2.0
*/
UnicodeString
UnicodeString
getNextString(UErrorCode& status);
/**
* Returns the next string in a resource or NULL if there are no more resources
* to iterate over.
* Returns the next string in a resource or NULL if there are no more resources
* to iterate over.
*
* @param key fill in for key associated with this string
* @param status fills in the outgoing error code
* @return an UnicodeString object.
* @stable ICU 2.0
*/
UnicodeString
getNextString(const char ** key,
UnicodeString
getNextString(const char ** key,
UErrorCode& status);
/**
* Returns the resource in a resource at the specified index.
* Returns the resource in a resource at the specified index.
*
* @param index an index to the wanted resource.
* @param status fills in the outgoing error code
* @return ResourceBundle object. If there is an error, resource is invalid.
* @stable ICU 2.0
*/
ResourceBundle
get(int32_t index,
ResourceBundle
get(int32_t index,
UErrorCode& status) const;
/**
@ -366,36 +366,36 @@ public:
* @return an UnicodeString object. If there is an error, string is bogus
* @stable ICU 2.0
*/
UnicodeString
getStringEx(int32_t index,
UnicodeString
getStringEx(int32_t index,
UErrorCode& status) const;
/**
* Returns a resource in a resource that has a given key. This procedure works only with table
* resources.
* resources.
*
* @param key a key associated with the wanted resource
* @param status fills in the outgoing error code.
* @return ResourceBundle object. If there is an error, resource is invalid.
* @stable ICU 2.0
*/
ResourceBundle
get(const char* key,
ResourceBundle
get(const char* key,
UErrorCode& status) const;
/**
* Returns a string in a resource that has a given key. This procedure works only with table
* resources.
* resources.
*
* @param key a key associated with the wanted string
* @param status fills in the outgoing error code
* @return an UnicodeString object. If there is an error, string is bogus
* @stable ICU 2.0
*/
UnicodeString
getStringEx(const char* key,
UnicodeString
getStringEx(const char* key,
UErrorCode& status) const;
/**
* Return the version number associated with this ResourceBundle as a string. Please
* use getVersion, as this method is going to be deprecated.
@ -405,7 +405,7 @@ public:
* @see getVersion
* @deprecated ICU 2.8 Use getVersion instead.
*/
const char*
const char*
getVersionNumber(void) const;
/**
@ -415,11 +415,11 @@ public:
* as specified in the resource bundle or its parent.
* @stable ICU 2.0
*/
void
void
getVersion(UVersionInfo versionInfo) const;
/**
* Return the Locale associated with this ResourceBundle.
* Return the Locale associated with this ResourceBundle.
*
* @return a Locale object
* @deprecated ICU 2.8 Use getLocale(ULocDataLocaleType type, UErrorCode &status) overload instead.
@ -428,7 +428,7 @@ public:
getLocale(void) const;
/**
* Return the Locale associated with this ResourceBundle.
* Return the Locale associated with this ResourceBundle.
* @param type You can choose between requested, valid and actual
* locale. For description see the definition of
* ULocDataLocaleType in uloc.h
@ -437,7 +437,7 @@ public:
* @return a Locale object
* @draft ICU 2.8
*/
const Locale
const Locale
getLocale(ULocDataLocaleType type, UErrorCode &status) const;
/**
* This API implements multilevel fallback
@ -457,7 +457,7 @@ public:
*
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
private:
ResourceBundle(); // default constructor not implemented

30
icu4c/source/common/unicode/schriter.h
View file

@ -50,8 +50,8 @@ public:
* Create an iterator over the UnicodeString referred to by "textStr".
* The iteration range is the whole string, and the starting
* position is specified by "textPos". If "textPos" is outside the valid
* iteration range, the behavior of this object is undefined.
* @param textStr The unicode string used to create an iterator
* iteration range, the behavior of this object is undefined.
* @param textStr The unicode string used to create an iterator
* @param textPos The starting position of the iteration
* @stable ICU 2.0
*/
@ -67,7 +67,7 @@ public:
* "textBegin" and "textEnd" don't form a valid range on "text" (i.e.,
* textBegin >= textEnd or either is negative or greater than text.size()),
* or "textPos" is outside the range defined by "textBegin" and "textEnd",
* the behavior of this iterator is undefined.
* the behavior of this iterator is undefined.
* @param textStr The unicode string used to create the StringCharacterIterator
* @param textBegin The begin position of the iteration range
* @param textEnd The end position of the iteration range
@ -82,7 +82,7 @@ public:
/**
* Copy constructor. The new iterator iterates over the same range
* of the same string as "that", and its initial position is the
* same as "that"'s current position.
* same as "that"'s current position.
* The UnicodeString object in "that" is copied.
* @param that The StringCharacterIterator to be copied
* @stable ICU 2.0
@ -90,7 +90,7 @@ public:
StringCharacterIterator(const StringCharacterIterator& that);
/**
* Destructor.
* Destructor.
* @stable ICU 2.0
*/
virtual ~StringCharacterIterator();
@ -100,7 +100,7 @@ public:
* range of the same string as "that", and refers to the same
* character within that string as "that" does.
* @param that The object to be copied.
* @return the newly created object.
* @return the newly created object.
* @stable ICU 2.0
*/
StringCharacterIterator&
@ -108,10 +108,10 @@ public:
/**
* Returns true if the iterators iterate over the same range of the
* same string and are pointing at the same character.
* same string and are pointing at the same character.
* @param that The ForwardCharacterIterator to be compared for equality
* @return true if the iterators iterate over the same range of the
* same string and are pointing at the same character.
* same string and are pointing at the same character.
* @stable ICU 2.0
*/
virtual UBool operator==(const ForwardCharacterIterator& that) const;
@ -119,12 +119,12 @@ public:
/**
* Returns a new StringCharacterIterator referring to the same
* character in the same range of the same string as this one. The
* caller must delete the new iterator.
* @return the newly cloned object.
* caller must delete the new iterator.
* @return the newly cloned object.
* @stable ICU 2.0
*/
virtual CharacterIterator* clone(void) const;
/**
* Sets the iterator to iterate over the provided string.
* @param newText The string to be iterated over
@ -136,24 +136,24 @@ public:
* Copies the UnicodeString under iteration into the UnicodeString
* referred to by "result". Even if this iterator iterates across
* only a part of this string, the whole string is copied.
* @param result Receives a copy of the text under iteration.
* @param result Receives a copy of the text under iteration.
* @stable ICU 2.0
*/
virtual void getText(UnicodeString& result);
/**
* Return a class ID for this object (not really public)
* Return a class ID for this object (not really public)
* @return a class ID for this object.
* @stable ICU 2.0
*/
virtual UClassID getDynamicClassID(void) const;
/**
* Return a class ID for this class (not really public)
* Return a class ID for this class (not really public)
* @return a class ID for this class
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
protected:
/**

52
icu4c/source/common/unicode/uchriter.h
View file

@ -78,14 +78,14 @@ public:
/**
* Copy constructor. The new iterator iterates over the same range
* of the same string as "that", and its initial position is the
* same as "that"'s current position.
* same as "that"'s current position.
* @param that The UCharCharacterIterator to be copied
* @stable ICU 2.0
*/
UCharCharacterIterator(const UCharCharacterIterator& that);
/**
* Destructor.
* Destructor.
* @stable ICU 2.0
*/
~UCharCharacterIterator();
@ -93,9 +93,9 @@ public:
/**
* Assignment operator. *this is altered to iterate over the sane
* range of the same string as "that", and refers to the same
* character within that string as "that" does.
* character within that string as "that" does.
* @param that The object to be copied
* @return the newly created object
* @return the newly created object
* @stable ICU 2.0
*/
UCharCharacterIterator&
@ -103,7 +103,7 @@ public:
/**
* Returns true if the iterators iterate over the same range of the
* same string and are pointing at the same character.
* same string and are pointing at the same character.
* @param that The ForwardCharacterIterator used to be compared for equality
* @return true if the iterators iterate over the same range of the
* same string and are pointing at the same character.
@ -112,7 +112,7 @@ public:
virtual UBool operator==(const ForwardCharacterIterator& that) const;
/**
* Generates a hash code for this iterator.
* Generates a hash code for this iterator.
* @return the hash code.
* @stable ICU 2.0
*/
@ -121,12 +121,12 @@ public:
/**
* Returns a new UCharCharacterIterator referring to the same
* character in the same range of the same string as this one. The
* caller must delete the new iterator.
* caller must delete the new iterator.
* @return the CharacterIterator newly created
* @stable ICU 2.0
*/
virtual CharacterIterator* clone(void) const;
/**
* Sets the iterator to refer to the first code unit in its
* iteration range, and returns that code unit.
@ -188,7 +188,7 @@ public:
/**
* Sets the iterator to refer to the "position"-th code unit
* in the text-storage object the iterator refers to, and
* returns that code unit.
* returns that code unit.
* @param position the position within the text-storage object
* @return the code unit
* @stable ICU 2.0
@ -209,14 +209,14 @@ public:
virtual UChar32 setIndex32(int32_t position);
/**
* Returns the code unit the iterator currently refers to.
* Returns the code unit the iterator currently refers to.
* @return the code unit the iterator currently refers to.
* @stable ICU 2.0
*/
virtual UChar current(void) const;
/**
* Returns the code point the iterator currently refers to.
* Returns the code point the iterator currently refers to.
* @return the code point the iterator currently refers to.
* @stable ICU 2.0
*/
@ -225,8 +225,8 @@ public:
/**
* Advances to the next code unit in the iteration range (toward
* endIndex()), and returns that code unit. If there are no more
* code units to return, returns DONE.
* @return the next code unit in the iteration range.
* code units to return, returns DONE.
* @return the next code unit in the iteration range.
* @stable ICU 2.0
*/
virtual UChar next(void);
@ -240,11 +240,11 @@ public:
* @stable ICU 2.0
*/
virtual UChar nextPostInc(void);
/**
* Advances to the next code point in the iteration range (toward
* endIndex()), and returns that code point. If there are no more
* code points to return, returns DONE.
* code points to return, returns DONE.
* Note that iteration with "pre-increment" semantics is less
* efficient than iteration with "post-increment" semantics
* that is provided by next32PostInc().
@ -262,7 +262,7 @@ public:
* @stable ICU 2.0
*/
virtual UChar32 next32PostInc(void);
/**
* Returns FALSE if there are no more code units or code points
* at or after the current position in the iteration range.
@ -277,7 +277,7 @@ public:
/**
* Advances to the previous code unit in the iteration range (toward
* startIndex()), and returns that code unit. If there are no more
* code units to return, returns DONE.
* code units to return, returns DONE.
* @return the previous code unit in the iteration range.
* @stable ICU 2.0
*/
@ -287,7 +287,7 @@ public:
* Advances to the previous code point in the iteration range (toward
* startIndex()), and returns that code point. If there are no more
* code points to return, returns DONE.
* @return the previous code point in the iteration range.
* @return the previous code point in the iteration range.
* @stable ICU 2.0
*/
virtual UChar32 previous32(void);
@ -334,26 +334,26 @@ public:
* @stable ICU 2.0
*/
void setText(const UChar* newText, int32_t newTextLength);
/**
* Copies the UChar array under iteration into the UnicodeString
* referred to by "result". Even if this iterator iterates across
* only a part of this string, the whole string is copied.
* @param result Receives a copy of the text under iteration.
* @param result Receives a copy of the text under iteration.
* @stable ICU 2.0
*/
virtual void getText(UnicodeString& result);
/**
* Return a class ID for this class (not really public)
* @return a class ID for this class
* Return a class ID for this class (not really public)
* @return a class ID for this class
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
/**
* Return a class ID for this object (not really public)
* @return a class ID for this object.
* Return a class ID for this object (not really public)
* @return a class ID for this object.
* @stable ICU 2.0
*/
virtual UClassID getDynamicClassID(void) const;
@ -367,7 +367,7 @@ protected:
/**
* Protected member text
* @stable ICU 2.0
*/
*/
const UChar* text;
};

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

@ -101,7 +101,7 @@ public:
*
* @stable ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
protected:

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

@ -69,18 +69,18 @@ public:
/**
* Return the class ID for this class. This is useful only for
* comparing to a return value from getDynamicClassID().
* comparing to a return value from getDynamicClassID().
* @return The class ID for all objects of this class.
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
/**
* Returns a unique class ID <b>polymorphically</b>. This method
* is to implement a simple version of RTTI, since not all C++
* compilers support genuine RTTI. Polymorphic operator==() and
* clone() methods call this method.
*
*
* <p>Concrete subclasses of UnicodeFunctor should use the macro
* UOBJECT_DEFINE_RTTI_IMPLEMENTATION from uobject.h to
* provide definitios getStaticClassID and getDynamicClassID.

42
icu4c/source/common/unicode/uniset.h
View file

@ -21,7 +21,7 @@ class SymbolTable;
class UVector;
class CaseEquivClass;
class RuleCharacterIterator;
/**
* A mutable set of Unicode characters and multicharacter strings. Objects of this class
* represent <em>character classes</em> used in regular expressions.
@ -80,7 +80,7 @@ class RuleCharacterIterator;
* </tr>
* <tr>
* <td nowrap valign="top" align="left"><code>[a-e]</code></td>
* <td valign="top">The characters 'a' through 'e' inclusive, in Unicode code
* <td valign="top">The characters 'a' through 'e' inclusive, in Unicode code
* point order</td>
* </tr>
* <tr>
@ -89,7 +89,7 @@ class RuleCharacterIterator;
* </tr>
* <tr>
* <td nowrap valign="top" align="left"><code>[a{ab}{ac}]</code></td>
* <td valign="top">The character 'a' and the multicharacter strings &quot;ab&quot; and
* <td valign="top">The character 'a' and the multicharacter strings &quot;ab&quot; and
* &quot;ac&quot;</td>
* </tr>
* <tr>
@ -98,7 +98,7 @@ class RuleCharacterIterator;
* </tr>
* </table>
* \htmlonly</blockquote>\endhtmlonly
*
*
* Any character may be preceded by a backslash in order to remove any special
* meaning. White space characters, as defined by UCharacter.isWhitespace(), are
* ignored, unless they are escaped.
@ -617,7 +617,7 @@ public:
* @stable ICU 2.0
*/
virtual UBool contains(UChar32 c) const;
/**
* Returns true if this set contains every character
* of the given range.
@ -636,7 +636,7 @@ public:
* @stable ICU 2.4
*/
UBool contains(const UnicodeString& s) const;
/**
* Returns true if this set contains all the characters and strings
* of the given set.
@ -645,7 +645,7 @@ public:
* @stable ICU 2.4
*/
virtual UBool containsAll(const UnicodeSet& c) const;
/**
* Returns true if this set contains all the characters
* of the given string.
@ -654,7 +654,7 @@ public:
* @stable ICU 2.4
*/
UBool containsAll(const UnicodeString& s) const;
/**
* Returns true if this set contains none of the characters
* of the given range.
@ -673,7 +673,7 @@ public:
* @stable ICU 2.4
*/
UBool containsNone(const UnicodeSet& c) const;
/**
* Returns true if this set contains none of the characters
* of the given string.
@ -682,7 +682,7 @@ public:
* @stable ICU 2.4
*/
UBool containsNone(const UnicodeString& s) const;
/**
* Returns true if this set contains one or more of the characters
* in the given range.
@ -692,7 +692,7 @@ public:
* @stable ICU 2.4
*/
inline UBool containsSome(UChar32 start, UChar32 end) const;
/**
* Returns true if this set contains one or more of the characters
* and strings of the given set.
@ -701,7 +701,7 @@ public:
* @stable ICU 2.4
*/
inline UBool containsSome(const UnicodeSet& s) const;
/**
* Returns true if this set contains one or more of the characters
* of the given string.
@ -710,7 +710,7 @@ public:
* @stable ICU 2.4
*/
inline UBool containsSome(const UnicodeString& s) const;
/**
* Implement UnicodeMatcher::matches()
* @stable ICU 2.4
@ -720,7 +720,7 @@ public:
int32_t limit,
UBool incremental);
private:
private:
/**
* Returns the longest match for s in text at the given position.
* If limit > start then match forward from start+1 to limit
@ -745,7 +745,7 @@ public:
static int32_t matchRest(const Replaceable& text,
int32_t start, int32_t limit,
const UnicodeString& s);
/**
* Returns the smallest value i such that c < list[i]. Caller
* must ensure that c is a legal value or this method will enter
@ -824,7 +824,7 @@ public:
*/
UnicodeSet& add(const UnicodeString& s);
private:
private:
/**
* @return a code point IF the string consists of a single one.
* otherwise returns -1.
@ -833,7 +833,7 @@ public:
static int32_t getSingleCP(const UnicodeString& s);
void _add(const UnicodeString& s);
public:
/**
* Adds each of the characters in this string to the set. Thus "ch" => {"c", "h"}
@ -879,9 +879,9 @@ public:
* The caller owns the return object and is responsible for deleting it.
* @stable ICU 2.4
*/
static UnicodeSet* createFrom(const UnicodeString& s);
static UnicodeSet* U_EXPORT2 createFrom(const UnicodeString& s);
/**
* Makes a set from each of the characters in the string. Thus "ch" => {"c", "h"}
* @param s the source string
@ -889,7 +889,7 @@ public:
* The caller owns the return object and is responsible for deleting it.
* @stable ICU 2.4
*/
static UnicodeSet* createFromAll(const UnicodeString& s);
static UnicodeSet* U_EXPORT2 createFromAll(const UnicodeString& s);
/**
* Retain only the elements in this set that are contained in the
@ -1161,7 +1161,7 @@ public:
* @return The class ID for all objects of this class.
* @stable ICU 2.0
*/
static UClassID getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID(void);
/**
* Implement UnicodeFunctor API.

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

File diff suppressed because it is too large Load diff

4
icu4c/source/common/unicode/uobject.h
View file

@ -236,7 +236,7 @@ protected:
* @internal
*/
#define UOBJECT_DEFINE_RTTI_IMPLEMENTATION(myClass) \
UClassID myClass::getStaticClassID() { \
UClassID U_EXPORT2 myClass::getStaticClassID() { \
static const char classID = 0; \
return (UClassID)&classID; \
} \
@ -253,7 +253,7 @@ protected:
* @internal
*/
#define UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(myClass) \
UClassID myClass::getStaticClassID() { \
UClassID U_EXPORT2 myClass::getStaticClassID() { \
static const char classID = 0; \
return (UClassID)&classID; \
}

22
icu4c/source/common/unicode/usetiter.h
View file

@ -51,7 +51,7 @@ class UnicodeString;
class U_COMMON_API UnicodeSetIterator : public UObject {
protected:
/**
* Value of <tt>codepoint</tt> if the iterator points to a string.
* If <tt>codepoint == IS_STRING</tt>, then examine
@ -95,7 +95,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* @stable ICU 2.4
*/
UnicodeSetIterator(const UnicodeSet& set);
/**
* Create an iterator over nothing. <tt>next()</tt> and
* <tt>nextRange()</tt> return false. This is a convenience
@ -103,7 +103,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* @stable ICU 2.4
*/
UnicodeSetIterator();
/**
* Destructor.
* @stable ICU 2.4
@ -150,7 +150,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* false. If <tt>codepoint == IS_STRING</tt>, the value is a
* string in the <tt>string</tt> field. Otherwise the value is a
* single code point in the <tt>codepoint</tt> field.
*
*
* <p>The order of iteration is all code points in sorted order,
* followed by all strings sorted order. <tt>codepointEnd</tt> is
* undefined after calling this method. <tt>string</tt> is
@ -164,7 +164,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* @stable ICU 2.4
*/
UBool next();
/**
* Returns the next element in the set, either a code point range
* or a string. If there are no more elements in the set, return
@ -172,7 +172,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* string in the <tt>string</tt> field. Otherwise the value is a
* range of one or more code points from <tt>codepoint</tt> to
* <tt>codepointeEnd</tt> inclusive.
*
*
* <p>The order of iteration is all code points ranges in sorted
* order, followed by all strings sorted order. Ranges are
* disjoint and non-contiguous. <tt>string</tt> is undefined
@ -186,7 +186,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* @stable ICU 2.4
*/
UBool nextRange();
/**
* Sets this iterator to visit the elements of the given set and
* resets it to the start of that set. The iterator is valid only
@ -195,19 +195,19 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
* @stable ICU 2.4
*/
void reset(const UnicodeSet& set);
/**
* Resets this iterator to the start of the set.
* @stable ICU 2.4
*/
void reset();
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @stable ICU 2.4
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -217,7 +217,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject {
virtual UClassID getDynamicClassID() const;
// ======================= PRIVATES ===========================
protected:
// endElement and nextElements are really UChar32's, but we keep

4
icu4c/source/common/unicode/utypes.h
View file

@ -282,7 +282,7 @@ typedef double UDate;
* \code
* class Derived {
* public:
* static UClassID getStaticClassID();
* static UClassID U_EXPORT2 getStaticClassID();
* private:
* static char fgClassID;
* }
@ -696,7 +696,7 @@ typedef enum UErrorCode {
U_STRINGPREP_PROHIBITED_ERROR = U_IDNA_PROHIBITED_ERROR,
U_STRINGPREP_UNASSIGNED_ERROR = U_IDNA_UNASSIGNED_ERROR,
U_STRINGPREP_CHECK_BIDI_ERROR = U_IDNA_CHECK_BIDI_ERROR,
U_ERROR_LIMIT=U_IDNA_ERROR_LIMIT /**< This must always be the last value to indicate the limit for UErrorCode (last error code +1) */
} UErrorCode;

4
icu4c/source/common/uniset.cpp
View file

@ -1474,7 +1474,7 @@ UnicodeSet& UnicodeSet::removeAll(const UnicodeString& s) {
* @param the source string
* @return a newly created set containing the given string
*/
UnicodeSet* UnicodeSet::createFrom(const UnicodeString& s) {
UnicodeSet* U_EXPORT2 UnicodeSet::createFrom(const UnicodeString& s) {
UnicodeSet *set = new UnicodeSet();
set->add(s);
return set;
@ -1486,7 +1486,7 @@ UnicodeSet* UnicodeSet::createFrom(const UnicodeString& s) {
* @param the source string
* @return a newly created set containing the given characters
*/
UnicodeSet* UnicodeSet::createFromAll(const UnicodeString& s) {
UnicodeSet* U_EXPORT2 UnicodeSet::createFromAll(const UnicodeString& s) {
UnicodeSet *set = new UnicodeSet();
set->addAll(s);
return set;

54
icu4c/source/common/ustrenum.cpp
View file

@ -308,57 +308,3 @@ uenum_openCharStringsEnumeration(const char** strings, int32_t count,
return (UEnumeration*) result;
}
// The following has not been tested and is not used yet. [alan]
//
// // StringArrayEnumeration implementation ----------------------------------- ***
//
// StringArrayEnumeration::StringArrayEnumeration(const UChar** _strings, int32_t _count,
// UErrorCode& status) :
// strings(0), stringCount(-1), pos(0) {
// if (U_SUCCESS(status)) {
// if ((_count > 0 && _strings == 0) ||
// (_count < 0)) {
// status = U_ILLEGAL_ARGUMENT_ERROR;
// } else {
// stringCount = _count;
// strings = _strings;
// }
// }
// }
//
// StringArrayEnumeration::~StringArrayEnumeration() {
// // nothing to do; strings is an alias
// }
//
// StringEnumeration *StringArrayEnumeration::clone() const {
// UErrorCode ec = U_ZERO_ERROR;
// StringEnumeration *e = new StringArrayEnumeration(strings, stringCount, ec);
// if (U_FAILURE(ec)) {
// delete e;
// e = NULL;
// }
// return e;
// }
//
// int32_t StringArrayEnumeration::count(UErrorCode& /*status*/) const {
// return stringCount;
// }
//
// const UnicodeString* StringArrayEnumeration::snext(UErrorCode& status) {
// if (U_FAILURE(status)) {
// return NULL;
// }
// if (pos < stringCount) {
// return &unistr.setTo(strings[pos++], -1);
// } else {
// return NULL;
// }
// }
//
// void StringArrayEnumeration::reset(UErrorCode& /*status*/) {
// pos = 0;
// }
//
// UOBJECT_DEFINE_RTTI_IMPLEMENTATION(StringArrayEnumeration/*, StringEnumeration*/)
//eof

78
icu4c/source/common/ustrenum.h
View file

@ -39,7 +39,7 @@ uenum_openCharStringsEnumeration(const char** strings, int32_t count,
*/
class U_COMMON_API UStringEnumeration : public StringEnumeration {
public:
public:
/**
* Constructor. This constructor adopts its UEnumeration
* argument.
@ -55,7 +55,7 @@ class U_COMMON_API UStringEnumeration : public StringEnumeration {
* constructor.
*/
virtual ~UStringEnumeration();
/**
* Return the number of elements that the iterator traverses.
* @param status the error code.
@ -85,80 +85,12 @@ class U_COMMON_API UStringEnumeration : public StringEnumeration {
/**
* ICU4C "poor man's RTTI", returns a UClassID for this ICU class.
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
private:
private:
UEnumeration *uenum; // owned
};
//----------------------------------------------------------------------
// The following has not been tested and is not used yet. [alan]
//
// /**
// * A StringEnumeration over a fixed array of const UChar* strings.
// */
// class U_COMMON_API StringArrayEnumeration : public StringEnumeration {
//
// public:
// /**
// * Constructor.
// * @param strings pointer to array of const UChar*. If 'count' ==
// * 0, then this pointer is ignored. May be NULL if 'count' == 0.
// * @param count number of elements of strings, or 0. If 0, then
// * 'strings' is ignored.
// */
// StringArrayEnumeration(const UChar** strings, int32_t count,
// UErrorCode& status);
//
// /**
// * Destructor.
// */
// virtual ~StringArrayEnumeration();
//
// /**
// * Clone this object.
// * @return a clone of this object
// */
// virtual StringEnumeration *clone() const;
//
// /**
// * Return the number of elements that the iterator traverses.
// * @param status the error code.
// * @return number of elements in the iterator.
// */
// virtual int32_t count(UErrorCode& status) const;
//
// /**
// * Returns the next element a UnicodeString*. If there are no
// * more elements, returns NULL.
// * @param status the error code.
// * @return a pointer to the string, or NULL.
// */
// virtual const UnicodeString* snext(UErrorCode& status);
//
// /**
// * Resets the iterator.
// * @param status the error code.
// */
// virtual void reset(UErrorCode& status);
//
// /**
// * ICU4C "poor man's RTTI", returns a UClassID for the actual ICU class.
// */
// virtual UClassID getDynamicClassID() const;
//
// /**
// * ICU4C "poor man's RTTI", returns a UClassID for this ICU class.
// */
// static UClassID getStaticClassID();
//
// private:
// const UChar** strings;
// int32_t stringCount;
// int32_t pos;
// };
/* _USTRENUM_H_ */
#endif
/*eof*/

4
icu4c/source/common/uvector.h
View file

@ -250,7 +250,7 @@ public:
*
* @draft ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -327,7 +327,7 @@ public:
*
* @draft ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.

2
icu4c/source/common/uvectr32.h
View file

@ -166,7 +166,7 @@ public:
*
* @draft ICU 2.2
*/
static UClassID getStaticClassID();
static UClassID U_EXPORT2 getStaticClassID();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.