[pclasses-cvs] pclasses2/src/s11n/io/expat expat_serializer.h,1.1,1.2

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/s11n/io/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21948/src/s11n/io/expat

Modified Files:
	expat_serializer.h 
Log Message:
Mass commit: ported 2 s11n mini-libs (stringutil, str) into P::StringTool.

Index: expat_serializer.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/io/expat/expat_serializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat_serializer.h	26 Dec 2004 04:04:31 -0000	1.1
+++ expat_serializer.h	26 Dec 2004 12:30:06 -0000	1.2
@@ -1,7 +1,7 @@
 #ifndef s11n_EXPAT_SERIALIZER_HPP_INCLUDED
 #define s11n_EXPAT_SERIALIZER_HPP_INCLUDED 1
 
-#include <pclasses/s11n/str.h> // translate()
+#include <pclasses/Util/StringTool.h> // translateEntities()
 #include <pclasses/s11n/s11n_debuggering_macros.h> // COUT/CERR
 #include <pclasses/s11n/io/data_node_format.h>
 #include <pclasses/s11n/traits.h> // node_traits
@@ -76,7 +76,7 @@
 
                                 std::string nname = NT::name(src);
                                 std::string impl = NT::class_name(src);
-                                str::translate( impl, expat_serializer_translations(), false );
+                                ::P::StringTool::translateEntities( impl, expat_serializer_translations(), false );
                                 std::string indent;
                                 buff << "<" << nname << " "<<EXPAT_CLASS_ATTRIBUTE<<"=\""<< impl <<"\"";
                                 bool closed = false;
@@ -102,7 +102,7 @@
                                                 else
                                                 {
                                                         buff << ">";
-                                                        propval = str::translate( propval, expat_serializer_translations(), false );
+                                                        propval = ::P::StringTool::translateEntities( propval, expat_serializer_translations(), false );
                                                         buff << propval;
                                                         buff << "</" << key << ">";
                                                 }