From aebe16011150d70321c6f215c1d200f4f6d53489 Mon Sep 17 00:00:00 2001
From: Vladimir Weinstein <icu@weivsara.com>
Date: Fri, 20 Sep 2002 00:00:44 +0000
Subject: [PATCH] ICU-2209 moved canonical iterator from i18n to common per
 Markus's request

X-SVN-Rev: 9899
---
 icu4c/source/common/Makefile.in               |  2 +-
 icu4c/source/{i18n => common}/caniter.cpp     |  0
 icu4c/source/common/common.dsp                | 51 +++++++++++++++++++
 .../source/{i18n => common}/unicode/caniter.h |  2 +-
 icu4c/source/i18n/Makefile.in                 |  2 +-
 icu4c/source/i18n/i18n.dsp                    | 27 ----------
 6 files changed, 54 insertions(+), 30 deletions(-)
 rename icu4c/source/{i18n => common}/caniter.cpp (100%)
 rename icu4c/source/{i18n => common}/unicode/caniter.h (99%)

diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in
index 70d1faf8cc2..063070b6539 100644
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@@ -64,7 +64,7 @@ uchar.o uprops.o bidi.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o \
 ucln_cmn.o uscript.o usc_impl.o umemstrm.o ucmp8.o uvector.o digitlst.o \
 brkiter.o brkdict.o ubrk.o dbbi.o dbbi_tbl.o \
 rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
-unicode.o convert.o utrie.o uset.o cmemory.o \
+unicode.o convert.o utrie.o uset.o cmemory.o caniter.o \
 unifilt.o unifunct.o uniset.o upropset.o usetiter.o util.o uenum.o
 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
diff --git a/icu4c/source/i18n/caniter.cpp b/icu4c/source/common/caniter.cpp
similarity index 100%
rename from icu4c/source/i18n/caniter.cpp
rename to icu4c/source/common/caniter.cpp
diff --git a/icu4c/source/common/common.dsp b/icu4c/source/common/common.dsp
index c53fbed8ded..28cde52687a 100644
--- a/icu4c/source/common/common.dsp
+++ b/icu4c/source/common/common.dsp
@@ -163,6 +163,10 @@ SOURCE=.\brkiter.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\caniter.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\chariter.cpp
 # End Source File
 # Begin Source File
@@ -613,6 +617,53 @@ InputPath=.\unicode\brkiter.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\unicode\caniter.h
+
+!IF  "$(CFG)" == "common - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\unicode\caniter.h
+
+"..\..\include\unicode\caniter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\unicode\caniter.h
+
+"..\..\include\unicode\caniter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win64 Release"
+
+# Begin Custom Build
+InputPath=.\unicode\caniter.h
+
+"..\..\include\unicode\caniter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "common - Win64 Debug"
+
+# Begin Custom Build
+InputPath=.\unicode\caniter.h
+
+"..\..\include\unicode\caniter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy    $(InputPath)    ..\..\include\unicode
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\unicode\chariter.h
 
 !IF  "$(CFG)" == "common - Win32 Release"
diff --git a/icu4c/source/i18n/unicode/caniter.h b/icu4c/source/common/unicode/caniter.h
similarity index 99%
rename from icu4c/source/i18n/unicode/caniter.h
rename to icu4c/source/common/unicode/caniter.h
index 1389d81fecf..db81c115fb6 100644
--- a/icu4c/source/i18n/unicode/caniter.h
+++ b/icu4c/source/common/unicode/caniter.h
@@ -53,7 +53,7 @@ Results for: {LATIN CAPITAL LETTER A WITH RING ABOVE}{LATIN SMALL LETTER D}{COMB
  * @author C++ port by V. Weinstein
  * @draft ICU 2.4
  */
-class U_I18N_API CanonicalIterator : public UObject {
+class U_COMMON_API CanonicalIterator : public UObject {
 public:
     /**
      * Construct a CanonicalIterator object
diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in
index 06e1af099ca..84743e54a7f 100644
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@ -61,7 +61,7 @@ cpdtrans.o hextouni.o rbt.o rbt_data.o rbt_pars.o rbt_rule.o rbt_set.o \
 nultrans.o remtrans.o titletrn.o tolowtrn.o toupptrn.o anytrans.o \
 name2uni.o uni2name.o unitohex.o nortrans.o quant.o transreg.o \
 nfrs.o nfrule.o nfsubs.o rbnf.o esctrn.o unesctrn.o \
-funcrepl.o strrepl.o tridpars.o caniter.o \
+funcrepl.o strrepl.o tridpars.o \
 ucurr.o
 
 
diff --git a/icu4c/source/i18n/i18n.dsp b/icu4c/source/i18n/i18n.dsp
index 036b107198f..d5b4e474f27 100644
--- a/icu4c/source/i18n/i18n.dsp
+++ b/icu4c/source/i18n/i18n.dsp
@@ -163,10 +163,6 @@ SOURCE=.\calendar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\caniter.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\choicfmt.cpp
 # End Source File
 # Begin Source File
@@ -482,29 +478,6 @@ InputPath=.\unicode\calendar.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\unicode\caniter.h
-
-!IF  "$(CFG)" == "i18n - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "i18n - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\unicode\caniter.h
-
-"..\..\include\unicode\caniter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy    $(InputPath)    ..\..\include\unicode
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "i18n - Win64 Release"
-
-!ELSEIF  "$(CFG)" == "i18n - Win64 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\unicode\choicfmt.h
 
 !IF  "$(CFG)" == "i18n - Win32 Release"