re PR java/40590 (namespace namespace broken in CNI)

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590	
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl):
	Use printName().
	* tools/gnu/classpath/tools/javah/Keywords.java (words): Replace
	with keywords list from  gcc/java/mangle.c.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods):
	Don't pre-convert a C++ keyword.
	(print(CniPrintStream)): Call CniPrintStream.printName().
	(printContents): Likewise.
	* tools/gnu/classpath/tools/javah/CniPrintStream.java
	(getClassName): Don't call replaceAll("/", "::").
	(print(Type)): Add ""::" befor name, " *" after.  Use printName(), not
	print.
	(printName(PrintStream, String), printName(String), printlnName):
	New methods.
	(moveToPackage): Use printName().

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590
	* java-tree.h (cxx_keyword_p): New declaration.
	* mangle_name.c (utf8_cmp): Move here from mangle.c.
	(cxx_keywords): Likewise.
	(cxx_keyword_p): Likewise.
	(MANGLE_CXX_KEYWORDS): New macro.
	(append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS.
	(append_gpp_mangled_name): Likewise.
	* mangle.c: Move code to mangle_name.c.
	(mangle_member_name): Don't call cxx_keyword_p.

From-SVN: r149059

37 files changed, 120 insertions, 120 deletions

diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h
index 20dadf6..d82794d 100644
--- a/libjava/gnu/xml/transform/AbstractNumberNode.h
+++ b/libjava/gnu/xml/transform/AbstractNumberNode.h
@@ -34,7 +34,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -57,7 +57,7 @@ class gnu::xml::transform::AbstractNumberNode : public ::gnu::xml::transform::Te
 
 public: // actually package-private
   AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *);
   virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *);
   static jboolean isAlphanumeric(jchar);
@@ -65,7 +65,7 @@ public: // actually package-private
   static ::java::lang::String * roman(jboolean, jint);
   virtual JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint) = 0;
 public:
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static const jint ALPHABETIC = 0;
diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.h b/libjava/gnu/xml/transform/ApplyImportsNode.h
index f9e19a6..53f45e9 100644
--- a/libjava/gnu/xml/transform/ApplyImportsNode.h
+++ b/libjava/gnu/xml/transform/ApplyImportsNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ApplyImportsNode : public ::gnu::xml::transform::Temp
 public: // actually package-private
   ApplyImportsNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ApplyTemplatesNode.h b/libjava/gnu/xml/transform/ApplyTemplatesNode.h
index 02f49a2..c25d2f5 100644
--- a/libjava/gnu/xml/transform/ApplyTemplatesNode.h
+++ b/libjava/gnu/xml/transform/ApplyTemplatesNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,15 +51,15 @@ class gnu::xml::transform::ApplyTemplatesNode : public ::gnu::xml::transform::Te
 {
 
 public: // actually package-private
-  ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, jboolean);
+  ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
-  ::javax::xml::namespace::QName * mode;
+  ::javax::xml::namespace$::QName * mode;
   ::java::util::List * sortKeys;
   ::java::util::List * withParams;
   jboolean isDefault;
diff --git a/libjava/gnu/xml/transform/AttributeNode.h b/libjava/gnu/xml/transform/AttributeNode.h
index 80f6d3c..b83f7c8 100644
--- a/libjava/gnu/xml/transform/AttributeNode.h
+++ b/libjava/gnu/xml/transform/AttributeNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,11 +49,11 @@ class gnu::xml::transform::AttributeNode : public ::gnu::xml::transform::Templat
 public: // actually package-private
   AttributeNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::String * getPrefix(::java::lang::String *);
   ::java::lang::String * inventPrefix(::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
diff --git a/libjava/gnu/xml/transform/Bindings.h b/libjava/gnu/xml/transform/Bindings.h
index a54ab17..abbc8f0 100644
--- a/libjava/gnu/xml/transform/Bindings.h
+++ b/libjava/gnu/xml/transform/Bindings.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,12 +53,12 @@ public: // actually package-private
   virtual void push(jint);
   virtual void pop(jint);
 public:
-  virtual jboolean containsKey(::javax::xml::namespace::QName *, jint);
-  virtual ::java::lang::Object * get(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  virtual jboolean containsKey(::javax::xml::namespace$::QName *, jint);
+  virtual ::java::lang::Object * get(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
 public: // actually package-private
-  virtual void set(::javax::xml::namespace::QName *, ::java::lang::Object *, jint);
+  virtual void set(::javax::xml::namespace$::QName *, ::java::lang::Object *, jint);
 public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *);
+  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static const jint VARIABLE = 0;
diff --git a/libjava/gnu/xml/transform/CallTemplateNode.h b/libjava/gnu/xml/transform/CallTemplateNode.h
index f7d32ad..03b2d17 100644
--- a/libjava/gnu/xml/transform/CallTemplateNode.h
+++ b/libjava/gnu/xml/transform/CallTemplateNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -47,14 +47,14 @@ class gnu::xml::transform::CallTemplateNode : public ::gnu::xml::transform::Temp
 {
 
 public: // actually package-private
-  CallTemplateNode(::javax::xml::namespace::QName *, ::java::util::List *);
+  CallTemplateNode(::javax::xml::namespace$::QName *, ::java::util::List *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::java::util::List * withParams;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ChooseNode.h b/libjava/gnu/xml/transform/ChooseNode.h
index 8857478..3351945 100644
--- a/libjava/gnu/xml/transform/ChooseNode.h
+++ b/libjava/gnu/xml/transform/ChooseNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ChooseNode : public ::gnu::xml::transform::TemplateNo
 public: // actually package-private
   ChooseNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/CommentNode.h b/libjava/gnu/xml/transform/CommentNode.h
index 2f04431..78b6d18 100644
--- a/libjava/gnu/xml/transform/CommentNode.h
+++ b/libjava/gnu/xml/transform/CommentNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::CommentNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   CommentNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/CopyNode.h b/libjava/gnu/xml/transform/CopyNode.h
index a57c004..e724dbb 100644
--- a/libjava/gnu/xml/transform/CopyNode.h
+++ b/libjava/gnu/xml/transform/CopyNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,8 +49,8 @@ class gnu::xml::transform::CopyNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   CopyNode(::java::lang::String *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/CopyOfNode.h b/libjava/gnu/xml/transform/CopyOfNode.h
index f339446..4bf6607 100644
--- a/libjava/gnu/xml/transform/CopyOfNode.h
+++ b/libjava/gnu/xml/transform/CopyOfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::CopyOfNode : public ::gnu::xml::transform::TemplateNo
 public: // actually package-private
   CopyOfNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/CurrentFunction.h b/libjava/gnu/xml/transform/CurrentFunction.h
index dee45ec..118bfe5 100644
--- a/libjava/gnu/xml/transform/CurrentFunction.h
+++ b/libjava/gnu/xml/transform/CurrentFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
diff --git a/libjava/gnu/xml/transform/DocumentFunction.h b/libjava/gnu/xml/transform/DocumentFunction.h
index a599fc4..88c31dc 100644
--- a/libjava/gnu/xml/transform/DocumentFunction.h
+++ b/libjava/gnu/xml/transform/DocumentFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -59,7 +59,7 @@ public: // actually package-private
   ::java::util::Collection * document(::java::lang::String *, ::java::lang::String *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
   ::org::w3c::dom::Node * base;
diff --git a/libjava/gnu/xml/transform/ElementAvailableFunction.h b/libjava/gnu/xml/transform/ElementAvailableFunction.h
index 0d25fe3..21a828a 100644
--- a/libjava/gnu/xml/transform/ElementAvailableFunction.h
+++ b/libjava/gnu/xml/transform/ElementAvailableFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -50,17 +50,17 @@ class gnu::xml::transform::ElementAvailableFunction : public ::gnu::xml::xpath::
 {
 
 public: // actually package-private
-  ElementAvailableFunction(::javax::xml::namespace::NamespaceContext *);
+  ElementAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
 public:
   virtual ::java::lang::Object * evaluate(::java::util::List *);
   virtual void setArguments(::java::util::List *);
   virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static ::java::util::Collection * elements;
-  ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
+  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
   ::java::util::List * args;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ElementNode.h b/libjava/gnu/xml/transform/ElementNode.h
index 73d0f0f..b086d2a 100644
--- a/libjava/gnu/xml/transform/ElementNode.h
+++ b/libjava/gnu/xml/transform/ElementNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,11 +49,11 @@ class gnu::xml::transform::ElementNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ElementNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::String * getPrefix(::java::lang::String *);
-  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
+  void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
diff --git a/libjava/gnu/xml/transform/ForEachNode.h b/libjava/gnu/xml/transform/ForEachNode.h
index 1cb11af..7b251d3 100644
--- a/libjava/gnu/xml/transform/ForEachNode.h
+++ b/libjava/gnu/xml/transform/ForEachNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::ForEachNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ForEachNode(::gnu::xml::xpath::Expr *, ::java::util::List *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.h b/libjava/gnu/xml/transform/FormatNumberFunction.h
index 417e897..634dc64 100644
--- a/libjava/gnu/xml/transform/FormatNumberFunction.h
+++ b/libjava/gnu/xml/transform/FormatNumberFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet;
   ::java::util::List * args;
diff --git a/libjava/gnu/xml/transform/FunctionAvailableFunction.h b/libjava/gnu/xml/transform/FunctionAvailableFunction.h
index b900a1b..b34bfb0 100644
--- a/libjava/gnu/xml/transform/FunctionAvailableFunction.h
+++ b/libjava/gnu/xml/transform/FunctionAvailableFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -50,18 +50,18 @@ class gnu::xml::transform::FunctionAvailableFunction : public ::gnu::xml::xpath:
 {
 
 public: // actually package-private
-  FunctionAvailableFunction(::javax::xml::namespace::NamespaceContext *);
+  FunctionAvailableFunction(::javax::xml::namespace$::NamespaceContext *);
 public:
   virtual ::java::lang::Object * evaluate(::java::util::List *);
   virtual void setArguments(::java::util::List *);
   virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
   virtual ::java::lang::String * toString();
 public: // actually package-private
   static ::java::util::Collection * xsltFunctions;
   static ::java::util::Collection * xpathFunctions;
-  ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
+  ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx;
   ::java::util::List * args;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/GenerateIdFunction.h b/libjava/gnu/xml/transform/GenerateIdFunction.h
index 8b1de4a..fe43452 100644
--- a/libjava/gnu/xml/transform/GenerateIdFunction.h
+++ b/libjava/gnu/xml/transform/GenerateIdFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,7 +55,7 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/IfNode.h b/libjava/gnu/xml/transform/IfNode.h
index dff1c47..357da0d 100644
--- a/libjava/gnu/xml/transform/IfNode.h
+++ b/libjava/gnu/xml/transform/IfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::IfNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   IfNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test;
diff --git a/libjava/gnu/xml/transform/Key.h b/libjava/gnu/xml/transform/Key.h
index 8588b2f..08ff987 100644
--- a/libjava/gnu/xml/transform/Key.h
+++ b/libjava/gnu/xml/transform/Key.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -41,9 +41,9 @@ class gnu::xml::transform::Key : public ::java::lang::Object
 {
 
 public: // actually package-private
-  Key(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *);
+  Key(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *);
   virtual ::gnu::xml::transform::Key * clone(::gnu::xml::transform::Stylesheet *);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   ::gnu::xml::xpath::Pattern * match;
   ::gnu::xml::xpath::Expr * use;
 public:
diff --git a/libjava/gnu/xml/transform/KeyFunction.h b/libjava/gnu/xml/transform/KeyFunction.h
index d9185e3..7da94b1 100644
--- a/libjava/gnu/xml/transform/KeyFunction.h
+++ b/libjava/gnu/xml/transform/KeyFunction.h
@@ -28,7 +28,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -61,7 +61,7 @@ public: // actually package-private
   void addKeyNodeIfMatch(::org::w3c::dom::Node *, ::java::util::Collection *, ::java::lang::String *, ::java::util::Collection *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) stylesheet;
   ::java::util::List * args;
diff --git a/libjava/gnu/xml/transform/LiteralNode.h b/libjava/gnu/xml/transform/LiteralNode.h
index 056f5f1..c314eae 100644
--- a/libjava/gnu/xml/transform/LiteralNode.h
+++ b/libjava/gnu/xml/transform/LiteralNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::LiteralNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   LiteralNode(::org::w3c::dom::Node *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/MessageNode.h b/libjava/gnu/xml/transform/MessageNode.h
index 06fda75..ebffd3d 100644
--- a/libjava/gnu/xml/transform/MessageNode.h
+++ b/libjava/gnu/xml/transform/MessageNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::MessageNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   MessageNode(jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/OtherwiseNode.h b/libjava/gnu/xml/transform/OtherwiseNode.h
index ecd0181..2a067a5 100644
--- a/libjava/gnu/xml/transform/OtherwiseNode.h
+++ b/libjava/gnu/xml/transform/OtherwiseNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::OtherwiseNode : public ::gnu::xml::transform::Templat
 public: // actually package-private
   OtherwiseNode();
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h
index aebd3e0..786be5a 100644
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ b/libjava/gnu/xml/transform/ParameterNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,12 +51,12 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat
 {
 
 public: // actually package-private
-  ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint);
+  ParameterNode(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *, jint);
   ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *);
   ::java::lang::String * toString();
 public: // actually package-private
@@ -64,7 +64,7 @@ public: // actually package-private
 public:
   jint compareTo(::java::lang::Object *);
 public: // actually package-private
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::gnu::xml::xpath::Expr * select;
   jint type;
 public:
diff --git a/libjava/gnu/xml/transform/ProcessingInstructionNode.h b/libjava/gnu/xml/transform/ProcessingInstructionNode.h
index f833915..35bae5f 100644
--- a/libjava/gnu/xml/transform/ProcessingInstructionNode.h
+++ b/libjava/gnu/xml/transform/ProcessingInstructionNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::ProcessingInstructionNode : public ::gnu::xml::transf
 public: // actually package-private
   ProcessingInstructionNode(::java::lang::String *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h
index b35aa5b..a8e0a29 100644
--- a/libjava/gnu/xml/transform/SortKey.h
+++ b/libjava/gnu/xml/transform/SortKey.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,8 +53,8 @@ class gnu::xml::transform::SortKey : public ::java::lang::Object
 public: // actually package-private
   SortKey(::gnu::xml::xpath::Expr *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *);
   ::java::lang::String * key(::org::w3c::dom::Node *);
-  void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  jboolean references(::javax::xml::namespace::QName *);
+  void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *);
 private:
   ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *);
diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h
index 8bfebcc..69ceaa8 100644
--- a/libjava/gnu/xml/transform/Stylesheet.h
+++ b/libjava/gnu/xml/transform/Stylesheet.h
@@ -33,7 +33,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -74,9 +74,9 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
 public: // actually package-private
-  virtual ::javax::xml::namespace::QName * getQName(::java::lang::String *);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jboolean);
-  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::javax::xml::namespace::QName *);
+  virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *);
+  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jboolean);
+  virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::javax::xml::namespace$::QName *);
   virtual ::gnu::xml::transform::Template * parseTemplate(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
   virtual void parseOutput(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
   virtual void parseKey(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *);
@@ -93,7 +93,7 @@ public: // actually package-private
   virtual ::gnu::xml::transform::TemplateNode * parseAttributeValueTemplate(::java::lang::String *, ::org::w3c::dom::Node *);
   virtual jboolean isPreserved(::org::w3c::dom::Text *, jboolean);
 public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint);
+  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint);
 public: // actually package-private
   virtual ::gnu::xml::transform::TemplateNode * parseApplyTemplates(::org::w3c::dom::Node *);
   virtual ::gnu::xml::transform::TemplateNode * parseCallTemplate(::org::w3c::dom::Node *);
diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.h b/libjava/gnu/xml/transform/SystemPropertyFunction.h
index dbbdc2d..e1f16d9 100644
--- a/libjava/gnu/xml/transform/SystemPropertyFunction.h
+++ b/libjava/gnu/xml/transform/SystemPropertyFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,10 +55,10 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
 public: // actually package-private
-  ::java::lang::Object * systemProperty(::javax::xml::namespace::QName *);
+  ::java::lang::Object * systemProperty(::javax::xml::namespace$::QName *);
 public:
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/Template.h b/libjava/gnu/xml/transform/Template.h
index 3b26715..018beac 100644
--- a/libjava/gnu/xml/transform/Template.h
+++ b/libjava/gnu/xml/transform/Template.h
@@ -31,7 +31,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,31 +53,31 @@ class gnu::xml::transform::Template : public ::java::lang::Object
 {
 
 public: // actually package-private
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace::QName *);
+  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *);
 private:
-  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace::QName *, jboolean);
+  Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace$::QName *, jboolean);
 public: // actually package-private
   virtual ::gnu::xml::transform::Template * clone(::gnu::xml::transform::Stylesheet *);
 public:
   virtual jint compareTo(::java::lang::Object *);
 public: // actually package-private
   virtual ::gnu::xml::xpath::Test * getNodeTest(::gnu::xml::xpath::Expr *);
-  virtual jboolean matches(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *);
-  virtual jboolean matches(::javax::xml::namespace::QName *);
+  virtual jboolean matches(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
+  virtual jboolean matches(::javax::xml::namespace$::QName *);
   virtual jboolean imports(::gnu::xml::transform::Template *);
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   virtual ::java::lang::String * toString();
 public: // actually package-private
   virtual void list(::java::io::PrintStream *);
   static jdouble DEFAULT_PRIORITY;
   ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stylesheet;
-  ::javax::xml::namespace::QName * name;
+  ::javax::xml::namespace$::QName * name;
   ::gnu::xml::xpath::Pattern * match;
   ::gnu::xml::transform::TemplateNode * node;
   jdouble priority;
   jint precedence;
-  ::javax::xml::namespace::QName * mode;
+  ::javax::xml::namespace$::QName * mode;
   jboolean isAnyNode;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/transform/TemplateNode.h b/libjava/gnu/xml/transform/TemplateNode.h
index b5ecbc8..354ff78 100644
--- a/libjava/gnu/xml/transform/TemplateNode.h
+++ b/libjava/gnu/xml/transform/TemplateNode.h
@@ -24,7 +24,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -47,14 +47,14 @@ class gnu::xml::transform::TemplateNode : public ::java::lang::Object
 
 public: // actually package-private
   TemplateNode();
-  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
+  virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
   virtual ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *) = 0;
 public:
-  virtual jboolean references(::javax::xml::namespace::QName *);
+  virtual jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   virtual void list(jint, ::java::io::PrintStream *, jboolean);
-  virtual jboolean hasParam(::javax::xml::namespace::QName *);
+  virtual jboolean hasParam(::javax::xml::namespace$::QName *);
   static ::java::util::Comparator * documentOrderComparator;
   ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
   ::gnu::xml::transform::TemplateNode * next;
diff --git a/libjava/gnu/xml/transform/TextNode.h b/libjava/gnu/xml/transform/TextNode.h
index a78bc1c..9a832d1 100644
--- a/libjava/gnu/xml/transform/TextNode.h
+++ b/libjava/gnu/xml/transform/TextNode.h
@@ -25,7 +25,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -49,7 +49,7 @@ class gnu::xml::transform::TextNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   TextNode(jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
   ::java::lang::String * toString();
 public: // actually package-private
diff --git a/libjava/gnu/xml/transform/TransformerImpl.h b/libjava/gnu/xml/transform/TransformerImpl.h
index 47c1d9a..9d10bd2 100644
--- a/libjava/gnu/xml/transform/TransformerImpl.h
+++ b/libjava/gnu/xml/transform/TransformerImpl.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -86,7 +86,7 @@ public:
 public: // actually package-private
   virtual void reindent(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, jint);
   virtual void convertCdataSectionElements(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, ::java::util::List *);
-  virtual jboolean match(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *);
+  virtual jboolean match(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *);
   ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) factory;
   ::gnu::xml::transform::Stylesheet * stylesheet;
   ::javax::xml::transform::URIResolver * uriResolver;
diff --git a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
index c1b94c9..646bb3b 100644
--- a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
+++ b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
@@ -27,7 +27,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -55,7 +55,7 @@ public:
   void setArguments(::java::util::List *);
   ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::xpath::Expr * clone(::java::lang::Object *);
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args;
 public:
diff --git a/libjava/gnu/xml/transform/ValueOfNode.h b/libjava/gnu/xml/transform/ValueOfNode.h
index cfd1317..30ed40d 100644
--- a/libjava/gnu/xml/transform/ValueOfNode.h
+++ b/libjava/gnu/xml/transform/ValueOfNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::ValueOfNode : public ::gnu::xml::transform::TemplateN
 public: // actually package-private
   ValueOfNode(::gnu::xml::xpath::Expr *, jboolean);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select;
diff --git a/libjava/gnu/xml/transform/WhenNode.h b/libjava/gnu/xml/transform/WhenNode.h
index c904902..835b382 100644
--- a/libjava/gnu/xml/transform/WhenNode.h
+++ b/libjava/gnu/xml/transform/WhenNode.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,9 +53,9 @@ class gnu::xml::transform::WhenNode : public ::gnu::xml::transform::TemplateNode
 public: // actually package-private
   WhenNode(::gnu::xml::xpath::Expr *);
   ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
-  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
 public:
-  jboolean references(::javax::xml::namespace::QName *);
+  jboolean references(::javax::xml::namespace$::QName *);
   ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test;
diff --git a/libjava/gnu/xml/transform/WithParam.h b/libjava/gnu/xml/transform/WithParam.h
index c588269..1d50e25 100644
--- a/libjava/gnu/xml/transform/WithParam.h
+++ b/libjava/gnu/xml/transform/WithParam.h
@@ -29,7 +29,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,12 +51,12 @@ class gnu::xml::transform::WithParam : public ::java::lang::Object
 {
 
 public: // actually package-private
-  WithParam(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *);
-  WithParam(::javax::xml::namespace::QName *, ::gnu::xml::transform::TemplateNode *);
-  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
+  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *);
+  WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::transform::TemplateNode *);
+  ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint);
   ::gnu::xml::transform::WithParam * clone(::gnu::xml::transform::Stylesheet *);
-  jboolean references(::javax::xml::namespace::QName *);
-  ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  jboolean references(::javax::xml::namespace$::QName *);
+  ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   ::gnu::xml::xpath::Expr * select;
   ::gnu::xml::transform::TemplateNode * content;
 public: