From ab59816e74c3d0d4e625fc041aafa89a8b58f6ed Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Sun, 3 Sep 2006 16:55:57 +0000 Subject: [PATCH] ICU-5304 Allow headers to work again without using U_NAMESPACE_USE X-SVN-Rev: 20238 --- icu4c/source/common/unicode/uiter.h | 6 +++--- icu4c/source/common/unicode/utext.h | 8 ++++---- icu4c/source/common/unormimp.h | 8 ++++---- icu4c/source/common/ustrenum.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/icu4c/source/common/unicode/uiter.h b/icu4c/source/common/unicode/uiter.h index 42c76677ed7..9409f01ee9a 100644 --- a/icu4c/source/common/unicode/uiter.h +++ b/icu4c/source/common/unicode/uiter.h @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 2002-2005, International Business Machines +* Copyright (C) 2002-2006, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -673,7 +673,7 @@ uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length); * @stable ICU 2.1 */ U_STABLE void U_EXPORT2 -uiter_setCharacterIterator(UCharIterator *iter, CharacterIterator *charIter); +uiter_setCharacterIterator(UCharIterator *iter, U_NAMESPACE_QUALIFIER CharacterIterator *charIter); /** * Set up a UCharIterator to iterate over a C++ Replaceable. @@ -698,7 +698,7 @@ uiter_setCharacterIterator(UCharIterator *iter, CharacterIterator *charIter); * @stable ICU 2.1 */ U_STABLE void U_EXPORT2 -uiter_setReplaceable(UCharIterator *iter, const Replaceable *rep); +uiter_setReplaceable(UCharIterator *iter, const U_NAMESPACE_QUALIFIER Replaceable *rep); #endif diff --git a/icu4c/source/common/unicode/utext.h b/icu4c/source/common/unicode/utext.h index 84aeb68afeb..170ccfd30bb 100644 --- a/icu4c/source/common/unicode/utext.h +++ b/icu4c/source/common/unicode/utext.h @@ -237,7 +237,7 @@ utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status); * @draft ICU 3.4 */ U_DRAFT UText * U_EXPORT2 -utext_openUnicodeString(UText *ut, UnicodeString *s, UErrorCode *status); +utext_openUnicodeString(UText *ut, U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status); /** @@ -253,7 +253,7 @@ utext_openUnicodeString(UText *ut, UnicodeString *s, UErrorCode *status); * @draft ICU 3.4 */ U_DRAFT UText * U_EXPORT2 -utext_openConstUnicodeString(UText *ut, const UnicodeString *s, UErrorCode *status); +utext_openConstUnicodeString(UText *ut, const U_NAMESPACE_QUALIFIER UnicodeString *s, UErrorCode *status); /** @@ -269,7 +269,7 @@ utext_openConstUnicodeString(UText *ut, const UnicodeString *s, UErrorCode *stat * @draft ICU 3.4 */ U_DRAFT UText * U_EXPORT2 -utext_openReplaceable(UText *ut, Replaceable *rep, UErrorCode *status); +utext_openReplaceable(UText *ut, U_NAMESPACE_QUALIFIER Replaceable *rep, UErrorCode *status); /** * Open a UText implementation over an ICU CharacterIterator. @@ -284,7 +284,7 @@ utext_openReplaceable(UText *ut, Replaceable *rep, UErrorCode *status); * @draft ICU 3.4 */ U_DRAFT UText * U_EXPORT2 -utext_openCharacterIterator(UText *ut, CharacterIterator *ic, UErrorCode *status); +utext_openCharacterIterator(UText *ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, UErrorCode *status); #endif diff --git a/icu4c/source/common/unormimp.h b/icu4c/source/common/unormimp.h index f7b678066e4..6ef197e4bcc 100644 --- a/icu4c/source/common/unormimp.h +++ b/icu4c/source/common/unormimp.h @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 2001-2004, International Business Machines +* Copyright (C) 2001-2006, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -236,7 +236,7 @@ unorm_internalNormalize(UChar *dest, int32_t destCapacity, U_CFUNC int32_t unorm_internalNormalizeWithNX(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, - UNormalizationMode mode, int32_t options, const UnicodeSet *nx, + UNormalizationMode mode, int32_t options, const U_NAMESPACE_QUALIFIER UnicodeSet *nx, UErrorCode *pErrorCode); #endif @@ -272,7 +272,7 @@ unorm_internalQuickCheck(const UChar *src, int32_t srcLength, UNormalizationMode mode, UBool allowMaybe, - const UnicodeSet *nx, + const U_NAMESPACE_QUALIFIER UnicodeSet *nx, UErrorCode *pErrorCode); #endif @@ -441,7 +441,7 @@ unorm_isNFSkippable(UChar32 c, UNormalizationMode mode); * Requires unorm_haveData(). * @internal */ -U_CFUNC const UnicodeSet * +U_CFUNC const U_NAMESPACE_QUALIFIER UnicodeSet * unorm_getNX(int32_t options, UErrorCode *pErrorCode); #endif diff --git a/icu4c/source/common/ustrenum.h b/icu4c/source/common/ustrenum.h index f43e0ad20c7..6580ceaca70 100644 --- a/icu4c/source/common/ustrenum.h +++ b/icu4c/source/common/ustrenum.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2002-2004, International Business Machines +* Copyright (c) 2002-2006, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -20,7 +20,7 @@ * delete it (regardless of error status). */ U_CAPI UEnumeration* U_EXPORT2 -uenum_openStringEnumeration(StringEnumeration* adopted, UErrorCode* ec); +uenum_openStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* adopted, UErrorCode* ec); /** * Given an array of const char* strings (invariant chars only),