ICU-7273 remove #include unormimp.h where not used any more

X-SVN-Rev: 27667

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"

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

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.

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

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"

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"
 

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"

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"

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

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}
 };

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"

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

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]))