diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
index e78703096edd8ed5002352cd86f71d2e1445f644..66b02923f44401f6013320c8e6aede7f7550ba5b 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
@@ -80,7 +80,7 @@
..\..\..\..\..\Build\Win32\BCB6\obj\XMLRegisterCleanup.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLString.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLStringTokenizer.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\XMLUCSTranscoder.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XMLUCS4Transcoder.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLUni.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLUri.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLURL.obj
@@ -445,7 +445,7 @@
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLRegisterCleanup.cpp" FORMNAME="" UNITNAME="XMLRegisterCleanup" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLString.cpp" FORMNAME="" UNITNAME="XMLString" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLStringTokenizer.cpp" FORMNAME="" UNITNAME="XMLStringTokenizer" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLUCSTranscoder.cpp" FORMNAME="" UNITNAME="XMLUCSTranscoder" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp" FORMNAME="" UNITNAME="XMLUCS4Transcoder" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLUni.cpp" FORMNAME="" UNITNAME="XMLUni" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLUri.cpp" FORMNAME="" UNITNAME="XMLUri" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLURL.cpp" FORMNAME="" UNITNAME="XMLURL" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -740,4 +740,4 @@ LibPrefix=
LibSuffix=
LibVersion=
</IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
+</PROJECT>
diff --git a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
index 1b42af74f14fa15f435d9adc41de93e9e3bd8ae3..b810b5d6d763c608ea2f0431eca43a65ecebbf08 100644
--- a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
@@ -69,7 +69,7 @@ OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
$(TARGETPATH)\obj\XMLNumber.obj \
$(TARGETPATH)\obj\XMLString.obj \
$(TARGETPATH)\obj\XMLStringTokenizer.obj \
- $(TARGETPATH)\obj\XMLUCSTranscoder.obj \
+ $(TARGETPATH)\obj\XMLUCS4Transcoder.obj \
$(TARGETPATH)\obj\XMLUni.obj \
$(TARGETPATH)\obj\XMLUri.obj \
$(TARGETPATH)\obj\XMLURL.obj \
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index a30f6577c428e0a2b3662384e1a1db5b4fc62849..06b51b858624fa0e1469df5a29e666afba5fb71c 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -1166,7 +1166,7 @@ SOURCE=..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\util\XMLUCSTranscoder.cpp
+SOURCE=..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp
# End Source File
# Begin Source File
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
index 9cf4db31529b8703dd4c119f5ce19600ffc7e7a3..62b56385e66bd0dceb7eff0149d861f84ddfe07c 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -292,7 +292,7 @@ CLEAN :
-@erase "$(INTDIR)\XMLSchemaDescriptionImpl.obj"
-@erase "$(INTDIR)\XMLString.obj"
-@erase "$(INTDIR)\XMLStringTokenizer.obj"
- -@erase "$(INTDIR)\XMLUCSTranscoder.obj"
+ -@erase "$(INTDIR)\XMLUCS4Transcoder.obj"
-@erase "$(INTDIR)\XMLUni.obj"
-@erase "$(INTDIR)\XMLUniCharacter.obj"
-@erase "$(INTDIR)\XMLUri.obj"
@@ -465,7 +465,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLRegisterCleanup.obj" \
"$(INTDIR)\XMLString.obj" \
"$(INTDIR)\XMLStringTokenizer.obj" \
- "$(INTDIR)\XMLUCSTranscoder.obj" \
+ "$(INTDIR)\XMLUCS4Transcoder.obj" \
"$(INTDIR)\XMLUni.obj" \
"$(INTDIR)\XMLUri.obj" \
"$(INTDIR)\XMLURL.obj" \
@@ -960,7 +960,7 @@ CLEAN :
-@erase "$(INTDIR)\XMLSchemaDescriptionImpl.obj"
-@erase "$(INTDIR)\XMLString.obj"
-@erase "$(INTDIR)\XMLStringTokenizer.obj"
- -@erase "$(INTDIR)\XMLUCSTranscoder.obj"
+ -@erase "$(INTDIR)\XMLUCS4Transcoder.obj"
-@erase "$(INTDIR)\XMLUni.obj"
-@erase "$(INTDIR)\XMLUniCharacter.obj"
-@erase "$(INTDIR)\XMLUri.obj"
@@ -1133,7 +1133,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLRegisterCleanup.obj" \
"$(INTDIR)\XMLString.obj" \
"$(INTDIR)\XMLStringTokenizer.obj" \
- "$(INTDIR)\XMLUCSTranscoder.obj" \
+ "$(INTDIR)\XMLUCS4Transcoder.obj" \
"$(INTDIR)\XMLUni.obj" \
"$(INTDIR)\XMLUri.obj" \
"$(INTDIR)\XMLURL.obj" \
@@ -1628,7 +1628,7 @@ CLEAN :
-@erase "$(INTDIR)\XMLSchemaDescriptionImpl.obj"
-@erase "$(INTDIR)\XMLString.obj"
-@erase "$(INTDIR)\XMLStringTokenizer.obj"
- -@erase "$(INTDIR)\XMLUCSTranscoder.obj"
+ -@erase "$(INTDIR)\XMLUCS4Transcoder.obj"
-@erase "$(INTDIR)\XMLUni.obj"
-@erase "$(INTDIR)\XMLUniCharacter.obj"
-@erase "$(INTDIR)\XMLUri.obj"
@@ -1802,7 +1802,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLRegisterCleanup.obj" \
"$(INTDIR)\XMLString.obj" \
"$(INTDIR)\XMLStringTokenizer.obj" \
- "$(INTDIR)\XMLUCSTranscoder.obj" \
+ "$(INTDIR)\XMLUCS4Transcoder.obj" \
"$(INTDIR)\XMLUni.obj" \
"$(INTDIR)\XMLUri.obj" \
"$(INTDIR)\XMLURL.obj" \
@@ -2296,7 +2296,7 @@ CLEAN :
-@erase "$(INTDIR)\XMLSchemaDescriptionImpl.obj"
-@erase "$(INTDIR)\XMLString.obj"
-@erase "$(INTDIR)\XMLStringTokenizer.obj"
- -@erase "$(INTDIR)\XMLUCSTranscoder.obj"
+ -@erase "$(INTDIR)\XMLUCS4Transcoder.obj"
-@erase "$(INTDIR)\XMLUni.obj"
-@erase "$(INTDIR)\XMLUniCharacter.obj"
-@erase "$(INTDIR)\XMLUri.obj"
@@ -2470,7 +2470,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLRegisterCleanup.obj" \
"$(INTDIR)\XMLString.obj" \
"$(INTDIR)\XMLStringTokenizer.obj" \
- "$(INTDIR)\XMLUCSTranscoder.obj" \
+ "$(INTDIR)\XMLUCS4Transcoder.obj" \
"$(INTDIR)\XMLUni.obj" \
"$(INTDIR)\XMLUri.obj" \
"$(INTDIR)\XMLURL.obj" \
@@ -3262,9 +3262,9 @@ SOURCE=..\..\..\..\..\src\xercesc\util\XMLStringTokenizer.cpp
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\src\xercesc\util\XMLUCSTranscoder.cpp
+SOURCE=..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp
-"$(INTDIR)\XMLUCSTranscoder.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\XMLUCS4Transcoder.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index 1046f725e385ff842266dcbd4be90c95fe452a3c..3584e1ee11a332b6411c03d13275bf547a0a3312 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -694,7 +694,7 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.hpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCSTranscoder.cpp">
+ RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp">
</File>
<File
RelativePath="..\..\..\..\..\src\xercesc\util\XMLUni.cpp">
diff --git a/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
index 6e74a803bdef487074ea08ca0910932faaa14dd5..1c5f6c61735931d6907553f88b5edbfc7af33a22 100644
--- a/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
@@ -931,7 +931,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCSTranscoder.cpp"
+ RelativePath="..\..\..\..\..\src\xercesc\util\XMLUCS4Transcoder.cpp"
>
</File>
<File
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e3570e149c4a1e988aa96739ff777e66370b91b..5d6d30b1f674e761f68261c5ca3d2b600e2d9317 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -878,7 +878,7 @@ util_sources = \
xercesc/util/XMLRegisterCleanup.cpp \
xercesc/util/XMLString.cpp \
xercesc/util/XMLStringTokenizer.cpp \
- xercesc/util/XMLUCSTranscoder.cpp \
+ xercesc/util/XMLUCS4Transcoder.cpp \
xercesc/util/XMLUni.cpp \
xercesc/util/XMLUri.cpp \
xercesc/util/XMLURL.cpp \
diff --git a/src/Makefile.in b/src/Makefile.in
index 58fedf9f6a4667b5bcbe515a9b71dfb6e030d5f2..011ae121acbc6354fc71514abcdbbef461af89ce 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -541,7 +541,7 @@ am__objects_24 = xercesc/util/Base64.lo \
xercesc/util/XMLInitializer.lo xercesc/util/XMLMsgLoader.lo \
xercesc/util/XMLNumber.lo xercesc/util/XMLRegisterCleanup.lo \
xercesc/util/XMLString.lo xercesc/util/XMLStringTokenizer.lo \
- xercesc/util/XMLUCSTranscoder.lo xercesc/util/XMLUni.lo \
+ xercesc/util/XMLUCS4Transcoder.lo xercesc/util/XMLUni.lo \
xercesc/util/XMLUri.lo xercesc/util/XMLURL.lo \
xercesc/util/XMLUTF16Transcoder.lo \
xercesc/util/XMLUTF8Transcoder.lo \
@@ -1788,7 +1788,7 @@ util_sources = \
xercesc/util/XMLRegisterCleanup.cpp \
xercesc/util/XMLString.cpp \
xercesc/util/XMLStringTokenizer.cpp \
- xercesc/util/XMLUCSTranscoder.cpp \
+ xercesc/util/XMLUCS4Transcoder.cpp \
xercesc/util/XMLUni.cpp \
xercesc/util/XMLUri.cpp \
xercesc/util/XMLURL.cpp \
@@ -2905,7 +2905,7 @@ xercesc/util/XMLString.lo: xercesc/util/$(am__dirstamp) \
xercesc/util/$(DEPDIR)/$(am__dirstamp)
xercesc/util/XMLStringTokenizer.lo: xercesc/util/$(am__dirstamp) \
xercesc/util/$(DEPDIR)/$(am__dirstamp)
-xercesc/util/XMLUCSTranscoder.lo: xercesc/util/$(am__dirstamp) \
+xercesc/util/XMLUCS4Transcoder.lo: xercesc/util/$(am__dirstamp) \
xercesc/util/$(DEPDIR)/$(am__dirstamp)
xercesc/util/XMLUni.lo: xercesc/util/$(am__dirstamp) \
xercesc/util/$(DEPDIR)/$(am__dirstamp)
@@ -3668,8 +3668,8 @@ mostlyclean-compile:
-rm -f xercesc/util/XMLString.lo
-rm -f xercesc/util/XMLStringTokenizer.$(OBJEXT)
-rm -f xercesc/util/XMLStringTokenizer.lo
- -rm -f xercesc/util/XMLUCSTranscoder.$(OBJEXT)
- -rm -f xercesc/util/XMLUCSTranscoder.lo
+ -rm -f xercesc/util/XMLUCS4Transcoder.$(OBJEXT)
+ -rm -f xercesc/util/XMLUCS4Transcoder.lo
-rm -f xercesc/util/XMLURL.$(OBJEXT)
-rm -f xercesc/util/XMLURL.lo
-rm -f xercesc/util/XMLUTF16Transcoder.$(OBJEXT)
@@ -4086,7 +4086,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLRegisterCleanup.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLString.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLStringTokenizer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLUCSTranscoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLUCS4Transcoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLURL.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLUTF16Transcoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/$(DEPDIR)/XMLUTF8Transcoder.Plo@am__quote@
diff --git a/src/xercesc/util/XMLUCSTranscoder.cpp b/src/xercesc/util/XMLUCS4Transcoder.cpp
similarity index 100%
rename from src/xercesc/util/XMLUCSTranscoder.cpp
rename to src/xercesc/util/XMLUCS4Transcoder.cpp