From 5cb38459a6e489d61840ead497b3882c2019116a Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Thu, 25 Feb 2010 00:21:02 +0000 Subject: [PATCH] ICU-7273 remove #include unormimp.h where not used any more X-SVN-Rev: 27667 --- icu4c/source/common/ucln_cmn.c | 7 ++----- icu4c/source/common/unistr_case.cpp | 3 +-- icu4c/source/common/unormimp.h | 12 ------------ icu4c/source/common/usprep.cpp | 1 - icu4c/source/i18n/ucol.cpp | 1 - icu4c/source/i18n/ucol_elm.cpp | 1 - icu4c/source/i18n/ucol_sit.cpp | 3 +-- icu4c/source/i18n/usearch.cpp | 1 - icu4c/source/test/cintltst/cnormtst.c | 1 - icu4c/source/test/cintltst/udatatst.c | 14 ++++++++++---- icu4c/source/test/intltest/normconf.cpp | 1 - icu4c/source/test/intltest/tstnrapi.cpp | 1 - icu4c/source/tools/gennorm2/n2builder.cpp | 1 - 13 files changed, 14 insertions(+), 33 deletions(-) diff --git a/icu4c/source/common/ucln_cmn.c b/icu4c/source/common/ucln_cmn.c index 66c8fb8535a..498c15e29f8 100644 --- a/icu4c/source/common/ucln_cmn.c +++ b/icu4c/source/common/ucln_cmn.c @@ -1,9 +1,7 @@ /* ****************************************************************************** -* * -* Copyright (C) 2001-2009, International Business Machines * -* Corporation and others. All Rights Reserved. * -* * +* Copyright (C) 2001-2010, International Business Machines +* Corporation and others. All Rights Reserved. ****************************************************************************** * file name: ucln_cmn.c * encoding: US-ASCII @@ -18,7 +16,6 @@ #include "unicode/uclean.h" #include "utracimp.h" #include "ustr_imp.h" -#include "unormimp.h" #include "ucln_cmn.h" #include "umutex.h" #include "ucln.h" diff --git a/icu4c/source/common/unistr_case.cpp b/icu4c/source/common/unistr_case.cpp index 617b80d0ce7..389232708bf 100644 --- a/icu4c/source/common/unistr_case.cpp +++ b/icu4c/source/common/unistr_case.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 1999-2007, International Business Machines +* Copyright (C) 1999-2010, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -26,7 +26,6 @@ #include "unicode/uchar.h" #include "unicode/ubrk.h" #include "ustr_imp.h" -#include "unormimp.h" #include "uhash.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/common/unormimp.h b/icu4c/source/common/unormimp.h index 247f3fd0ceb..d8896fd27ba 100644 --- a/icu4c/source/common/unormimp.h +++ b/icu4c/source/common/unormimp.h @@ -200,18 +200,6 @@ unorm_isCanonSafeStart(UChar32 c); U_CAPI UBool U_EXPORT2 unorm_getCanonStartSet(UChar32 c, USerializedSet *fillSet); -#ifdef XP_CPLUSPLUS - -/** - * Get normalization exclusion set for the options. - * Requires unorm_haveData(). - * @internal - */ -U_CFUNC const U_NAMESPACE_QUALIFIER UnicodeSet * -unorm_getNX(int32_t options, UErrorCode *pErrorCode); - -#endif - /** * Enumerate each normalization data trie and add the * start of each range of same properties to the set. diff --git a/icu4c/source/common/usprep.cpp b/icu4c/source/common/usprep.cpp index 4371f4668ef..29599e6c110 100644 --- a/icu4c/source/common/usprep.cpp +++ b/icu4c/source/common/usprep.cpp @@ -32,7 +32,6 @@ #include "cstring.h" #include "udataswp.h" #include "ucln_cmn.h" -#include "unormimp.h" #include "ubidi_props.h" U_NAMESPACE_USE diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp index cfacd639e96..cbb6684f6de 100644 --- a/icu4c/source/i18n/ucol.cpp +++ b/icu4c/source/i18n/ucol.cpp @@ -29,7 +29,6 @@ #include "bocsu.h" #include "normalizer2impl.h" -#include "unormimp.h" #include "unorm_it.h" #include "umutex.h" #include "cmemory.h" diff --git a/icu4c/source/i18n/ucol_elm.cpp b/icu4c/source/i18n/ucol_elm.cpp index 12c62b27c84..597bfe9a8ca 100644 --- a/icu4c/source/i18n/ucol_elm.cpp +++ b/icu4c/source/i18n/ucol_elm.cpp @@ -35,7 +35,6 @@ #include "ucol_elm.h" #include "ucol_tok.h" #include "ucol_cnt.h" -#include "unormimp.h" #include "unicode/caniter.h" #include "cmemory.h" diff --git a/icu4c/source/i18n/ucol_sit.cpp b/icu4c/source/i18n/ucol_sit.cpp index afeae90bcf8..9b7a6d27301 100644 --- a/icu4c/source/i18n/ucol_sit.cpp +++ b/icu4c/source/i18n/ucol_sit.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2004-2009, International Business Machines +* Copyright (C) 2004-2010, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * file name: ucol_sit.cpp @@ -19,7 +19,6 @@ #include "utracimp.h" #include "ucol_imp.h" #include "ucol_tok.h" -#include "unormimp.h" #include "cmemory.h" #include "cstring.h" #include "uresimp.h" diff --git a/icu4c/source/i18n/usearch.cpp b/icu4c/source/i18n/usearch.cpp index 0833cadbf03..35121a795e7 100644 --- a/icu4c/source/i18n/usearch.cpp +++ b/icu4c/source/i18n/usearch.cpp @@ -15,7 +15,6 @@ #include "unicode/ustring.h" #include "unicode/uchar.h" #include "normalizer2impl.h" -#include "unormimp.h" #include "ucol_imp.h" #include "usrchimp.h" #include "cmemory.h" diff --git a/icu4c/source/test/cintltst/cnormtst.c b/icu4c/source/test/cintltst/cnormtst.c index 11f731e77da..4341b7f7511 100644 --- a/icu4c/source/test/cintltst/cnormtst.c +++ b/icu4c/source/test/cintltst/cnormtst.c @@ -16,7 +16,6 @@ /*tests for u_normalization*/ #include "unicode/utypes.h" #include "unicode/unorm.h" -#include "unormimp.h" #include "cintltst.h" #if UCONFIG_NO_NORMALIZATION diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c index 8da19a4a572..64bbe9f0f4d 100644 --- a/icu4c/source/test/cintltst/udatatst.c +++ b/icu4c/source/test/cintltst/udatatst.c @@ -51,11 +51,15 @@ #include "ucol_imp.h" #include "ucol_swp.h" #include "ucnv_bld.h" -#include "unormimp.h" #include "sprpimpl.h" #include "propname.h" #include "rbbidata.h" +U_CAPI int32_t U_EXPORT2 +unorm2_swap(const UDataSwapper *ds, + const void *inData, int32_t length, void *outData, + UErrorCode *pErrorCode); + /* other definitions and prototypes */ #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) @@ -1317,13 +1321,15 @@ static const struct { * we need not jump through hoops (like adding snapshots of these files * to testdata) for code coverage in tests. * See Jitterbug 4497. + * + * ICU4C 4.4 adds normalization data files again, e.g., nfc.nrm. */ -#if !UCONFIG_NO_NORMALIZATION - {"unorm", "icu", unorm_swap}, -#endif {"uprops", "icu", uprops_swap}, {"ucase", "icu", ucase_swap}, {"ubidi", "icu", ubidi_swap}, +#endif +#if !UCONFIG_NO_NORMALIZATION + {"nfc", "nrm", unorm2_swap}, #endif {"unames", "icu", uchar_swapNames} }; diff --git a/icu4c/source/test/intltest/normconf.cpp b/icu4c/source/test/intltest/normconf.cpp index 98958095123..fae7cf696dc 100644 --- a/icu4c/source/test/intltest/normconf.cpp +++ b/icu4c/source/test/intltest/normconf.cpp @@ -13,7 +13,6 @@ #include "unicode/normlzr.h" #include "unicode/uniset.h" #include "unicode/putil.h" -#include "unormimp.h" #include "cstring.h" #include "filestrm.h" #include "normconf.h" diff --git a/icu4c/source/test/intltest/tstnrapi.cpp b/icu4c/source/test/intltest/tstnrapi.cpp index 61d8398f7f3..110e206c2d4 100644 --- a/icu4c/source/test/intltest/tstnrapi.cpp +++ b/icu4c/source/test/intltest/tstnrapi.cpp @@ -10,7 +10,6 @@ #include "unicode/uniset.h" #include "unicode/usetiter.h" #include "unicode/schriter.h" -#include "unormimp.h" #include "tstnorm.h" #if !UCONFIG_NO_NORMALIZATION diff --git a/icu4c/source/tools/gennorm2/n2builder.cpp b/icu4c/source/tools/gennorm2/n2builder.cpp index e2db7180f5f..daf9e1cba6e 100644 --- a/icu4c/source/tools/gennorm2/n2builder.cpp +++ b/icu4c/source/tools/gennorm2/n2builder.cpp @@ -38,7 +38,6 @@ #include "normalizer2impl.h" #include "toolutil.h" #include "unewdata.h" -#include "unormimp.h" #include "utrie2.h" #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))