1 files changed, 11 insertions, 19 deletions
diff --git a/xsd/xsd/elements.hxx b/xsd/xsd/elements.hxx
index 3a535a6..b09803f 100644
--- a/xsd/xsd/elements.hxx
+++ b/xsd/xsd/elements.hxx
@@ -1,37 +1,30 @@
 // file      : xsd/elements.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef ELEMENTS_HXX
 #define ELEMENTS_HXX
 
-#include <cult/types.hxx>
-
 #include <xsd-frontend/semantic-graph.hxx>
 #include <xsd-frontend/traversal.hxx>
 
-using namespace Cult;
-typedef WideString String;
+#include <types.hxx>
 
 namespace SemanticGraph = XSDFrontend::SemanticGraph;
 namespace Traversal = XSDFrontend::Traversal;
 
-
 // Anonymous feedback via belongs edge.
 //
-struct AnonymousBase : Traversal::Element,
-                       Traversal::Attribute
+struct AnonymousBase : Traversal::Element, Traversal::Attribute
 {
-  AnonymousBase (Traversal::NodeDispatcherBase& d1)
+  AnonymousBase (Traversal::NodeDispatcher& d1)
       : complex_ (&d1, 0)
   {
     edge_traverser (belongs_);
     belongs_.node_traverser (complex_);
   }
 
-  AnonymousBase (Traversal::NodeDispatcherBase& d1,
-                 Traversal::NodeDispatcherBase& d2)
+  AnonymousBase (Traversal::NodeDispatcher& d1, Traversal::NodeDispatcher& d2)
       : complex_ (&d1, &d2)
   {
     edge_traverser (belongs_);
@@ -65,7 +58,7 @@ public:
 
 public:
 
-  virtual Void
+  virtual void
   traverse (SemanticGraph::Element& e)
   {
     SemanticGraph::Type& t (e.type ());
@@ -84,7 +77,7 @@ public:
     }
   }
 
-  virtual Void
+  virtual void
   traverse (SemanticGraph::Attribute& a)
   {
     SemanticGraph::Type& t (a.type ());
@@ -106,13 +99,12 @@ public:
 private:
   struct Complex : Traversal::Complex
   {
-    Complex (Traversal::NodeDispatcherBase* d1,
-             Traversal::NodeDispatcherBase* d2)
+    Complex (Traversal::NodeDispatcher* d1, Traversal::NodeDispatcher* d2)
         : d1_ (d1), d2_ (d2)
     {
     }
 
-    virtual Void
+    virtual void
     traverse (SemanticGraph::Complex& c)
     {
       if (d1_)
@@ -123,8 +115,8 @@ private:
     }
 
   private:
-    Traversal::NodeDispatcherBase* d1_;
-    Traversal::NodeDispatcherBase* d2_;
+    Traversal::NodeDispatcher* d1_;
+    Traversal::NodeDispatcher* d2_;
 
   } complex_;