--- parser3/src/include/pa_request.h	2003/03/03 13:44:25	1.160.2.28
+++ parser3/src/include/pa_request.h	2003/03/08 16:41:30	1.160.2.33
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/03/03 13:44:25 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/03/08 16:41:30 $";
 
 #include "pa_pool.h"
 #include "pa_request_info.h"
@@ -18,10 +18,6 @@ static const char* IDENT_REQUEST_H="$Dat
 #include "pa_stack.h"
 #include "pa_vclass.h"
 #include "pa_vobject.h"
-#include "pa_vform.h"
-#include "pa_vmail.h"
-#include "pa_vresponse.h"
-#include "pa_vcookie.h"
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
@@ -54,6 +50,11 @@ const uint ANTI_ENDLESS_EXECUTE_RECOURSI
 class Temp_lang;
 class Methoded;
 class VMethodFrame;
+class GdomeDOMString_auto_ptr;
+class VMail; DECLARE_OBJECT_PTR(VMail);
+class VForm; DECLARE_OBJECT_PTR(VForm);
+class VResponse; DECLARE_OBJECT_PTR(VResponse);
+class VCookie; DECLARE_OBJECT_PTR(VCookie);
 
 /// Main workhorse.
 class Request: public PA_Object {
@@ -84,7 +85,7 @@ public:
 
 	class StackItem {
 	public:
-		StringPtr string(Pool& pool) { return value->get_string(&pool); }
+		StringPtr string(Pool& pool) const { return value->get_string(&pool); }
 		ValuePtr value;
 		ArrayOperationPtr ops;
 		void *ptr;
@@ -297,6 +298,26 @@ public: // status read methods
 	}
 	*/
 
+#ifdef XML
+public: // charset helpers
+
+	/// @see Charset::transcode
+	GdomeDOMString_auto_ptr transcode(StringPtr s);
+	/// @see Charset::transcode
+	StringPtr transcode(GdomeDOMString* s
+#ifndef NO_STRING_ORIGIN
+		, StringPtr origin
+#endif
+		);
+	/// @see Charset::transcode
+	StringPtr transcode(xmlChar* s
+#ifndef NO_STRING_ORIGIN
+		, StringPtr origin
+#endif
+		);
+
+#endif
+
 private:
 
 	/// already executed some @conf method