--- parser3/src/include/pa_charset.h	2003/01/28 15:16:49	1.20.2.6
+++ parser3/src/include/pa_charset.h	2003/01/31 12:34:29	1.20.2.10
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Charset connection decl.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/01/28 15:16:49 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/01/31 12:34:29 $";
 
 #include "pa_pool.h"
 #include "pa_exception.h"
@@ -45,10 +45,10 @@ class Charset: public PA_Object {
 	Pool pool_for_load;
 public:
 
-	Charset(ConstStringPtr aname, ConstStringPtr afile_spec);
+	Charset(StringPtr aname, StringPtr afile_spec);
 	override ~Charset();
 	
-	ConstStringPtr name() const { return fname; }
+	StringPtr name() const { return fname; }
 
 	bool isUTF8() const { return fisUTF8; }
 
@@ -67,7 +67,7 @@ public:
 
 private:
 
-	void load_definition(ConstStringPtr afile_spec);
+	void load_definition(StringPtr afile_spec);
 	void sort_ToTable();
 
 	void transcodeToUTF8(Pool& pool,
@@ -92,7 +92,7 @@ public:
 
 private:
 
-	ConstStringPtr fname;
+	StringPtr fname;
 	CharPtr fname_cstr;
 	bool fisUTF8;
 	Tables tables;
@@ -101,11 +101,11 @@ private:
 
 private:
 	void addEncoding(char *name_cstr);
-	void initTranscoder(const String *source, const char *name_cstr);
+	void initTranscoder(const String *source, const char* name_cstr);
 	
 public:
 	/// converts GdomeDOMString string to char *
-	const char *transcode_cstr(GdomeDOMString *s);
+	const char* transcode_cstr(GdomeDOMString *s);
 	/// converts GdomeDOMString string to parser String
 	String& transcode(GdomeDOMString *s
 #ifndef NO_STRING_ORIGIN
@@ -113,7 +113,7 @@ public:
 #endif
 		);
 	/// converts xmlChar* null-terminated string to char *
-	const char *transcode_cstr(xmlChar *s);
+	const char* transcode_cstr(xmlChar *s);
 	/// converts xmlChar* null-terminated string to parser String
 	String& transcode(xmlChar *s
 #ifndef NO_STRING_ORIGIN
@@ -123,9 +123,9 @@ public:
 	/** converts sized char * to xmlChar*
 		@returns xmlChar * which caller should free
 	*/
-	xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size);
+	xmlChar *transcode_buf2xchar(const char* buf, size_t buf_size);
 	/// converts char * to GdomeDOMString
-	GdomeDOMString_auto_ptr transcode_buf2dom(const char *buf, size_t buf_size);
+	GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size);
 	/// converts parser String to GdomeDOMString
 	GdomeDOMString_auto_ptr transcode(const String& s);
 
@@ -136,20 +136,10 @@ private:
 #endif
 
 };
-
-DECLARE_OBJECT_PTR(Charset)
+DECLARE_OBJECT_PTR(Charset);
 
 extern CharsetPtr UTF8_charset;
 
-
-struct Request_charset_info {
-	Pool *pool;
-	Charset *source;
-	Charset *client;
-	Charset *mail;
-};
-
-
 #ifdef XML
 /// Auto-object used to track GdomeDOMString usage
 class GdomeDOMString_auto_ptr {